diff --git a/charts/llm-d/Chart.yaml b/charts/llm-d/Chart.yaml
index 1ddf863..69d0cf0 100644
--- a/charts/llm-d/Chart.yaml
+++ b/charts/llm-d/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: llm-d
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: "0.0.1"
 icon: data:null
 description: A Helm chart for llm-d
diff --git a/charts/llm-d/README.md b/charts/llm-d/README.md
index 6b85961..a087790 100644
--- a/charts/llm-d/README.md
+++ b/charts/llm-d/README.md
@@ -1,7 +1,7 @@
 
 # llm-d Helm Chart for OpenShift
 
-![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square)
+![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for llm-d
diff --git a/charts/llm-d/templates/modelservice/clusterRoleManager.yaml b/charts/llm-d/templates/modelservice/clusterRoleManager.yaml
index 0edaf68..f2a2118 100644
--- a/charts/llm-d/templates/modelservice/clusterRoleManager.yaml
+++ b/charts/llm-d/templates/modelservice/clusterRoleManager.yaml
@@ -36,6 +36,7 @@ rules:
   - list
   - watch
   - create
+  - update
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:
@@ -46,6 +47,54 @@ rules:
   - list
   - watch
   - create
+  - update
+  # MSV2 HACK BEGIN ---------------
+- apiGroups:
+  - "v1"
+  resources:
+  - "secrets"
+  verbs:
+  - "get"
+  - "list"
+  - "watch"
+- apiGroups:
+  - "inference.networking.x-k8s.io"
+  resources:
+  - "inferencepools"
+  - "inferencemodels"
+  verbs:
+  - "get"
+  - "watch"
+  - "list"
+- apiGroups:
+  - ""
+  resources:
+  - "pods"
+  verbs:
+  - "get"
+  - "watch"
+  - "list"
+- apiGroups:
+  - "discovery.k8s.io"
+  resources:
+  - "endpointslices"
+  verbs:
+  - "get"
+  - "watch"
+  - "list"
+- apiGroups:
+  - "authentication.k8s.io"
+  resources:
+  - "tokenreviews"
+  verbs:
+  - "create"
+- apiGroups:
+  - "authorization.k8s.io"
+  resources:
+  - "subjectaccessreviews"
+  verbs:
+  - "create"
+  # MSV2 HACK END ---------------
 - apiGroups:
   - apps
   resources:
diff --git a/charts/llm-d/templates/modelservice/deployment.yaml b/charts/llm-d/templates/modelservice/deployment.yaml
index 60b1f44..bd2c792 100644
--- a/charts/llm-d/templates/modelservice/deployment.yaml
+++ b/charts/llm-d/templates/modelservice/deployment.yaml
@@ -42,8 +42,16 @@ spec:
         - --metrics-bind-address=:8443
         - --leader-elect=false
         - --health-probe-bind-address=:8081
+        # MSV2 HACK BEGIN
         - --epp-cluster-role
-        - endpoint-picker-role
+        - endpoint-picker-clusterrole
+        - --epp-pull-secrets
+        - endpoint-picker-pull-secret
+        - --pd-cluster-role
+        - prefill-decode-clusterrole
+        - --pd-pull-secrets
+        - prefill-decode-pull-secret
+        # MSV2 HACK END
         command:
         - /manager
         image: {{ include "modelservice.image" . }}
diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-epp.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-epp.yaml
index 76725c2..b7ff89b 100644
--- a/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-epp.yaml
+++ b/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-epp.yaml
@@ -1,7 +1,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: endpoint-picker-role
+  name: endpoint-picker-clusterrole
 rules:
 - apiGroups:
   - "inference.networking.x-k8s.io"
diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-pd.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-pd.yaml
new file mode 100644
index 0000000..f318f01
--- /dev/null
+++ b/charts/llm-d/templates/modelservice/ms-v2-hack/clusterRole-pd.yaml
@@ -0,0 +1,5 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: prefill-decode-clusterrole
+rules:
diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml
new file mode 100644
index 0000000..c78dc14
--- /dev/null
+++ b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml
@@ -0,0 +1,4 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: endpoint-picker-pull-secret
diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml
new file mode 100644
index 0000000..0925b89
--- /dev/null
+++ b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml
@@ -0,0 +1,4 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: pd-pull-secret