diff --git a/charts/llm-d/Chart.yaml b/charts/llm-d/Chart.yaml
index f09ab03..7752df9 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.8
+version: 0.0.9
 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 cd0ff30..6780f01 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.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square)
+![Version: 0.0.9](https://img.shields.io/badge/Version-0.0.9-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/_helpers.tpl b/charts/llm-d/templates/modelservice/_helpers.tpl
index 1ecff11..0ce8188 100644
--- a/charts/llm-d/templates/modelservice/_helpers.tpl
+++ b/charts/llm-d/templates/modelservice/_helpers.tpl
@@ -70,3 +70,29 @@ Return the proper Docker Image Registry Secret Names
 {{- define "vllmSim.renderImagePullSecrets" -}}
   {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.modelservice.vllmSim.image) "context" $) -}}
 {{- end -}}
+
+
+{{- define "common.images.renderImagePullSecretsString" -}}
+  {{- $pullSecrets := list }}
+  {{- $context := .context }}
+
+  {{- range (($context.Values.global).imagePullSecrets) -}}
+    {{- if kindIs "map" . -}}
+      {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" .name "context" $context)) -}}
+    {{- else -}}
+      {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" . "context" $context)) -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .images -}}
+    {{- range .pullSecrets -}}
+      {{- if kindIs "map" . -}}
+        {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" .name "context" $context)) -}}
+      {{- else -}}
+        {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" . "context" $context)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- join "," ($pullSecrets | uniq) | quote }}
+{{- end }}
diff --git a/charts/llm-d/templates/modelservice/deployment.yaml b/charts/llm-d/templates/modelservice/deployment.yaml
index bd2c792..b60f26d 100644
--- a/charts/llm-d/templates/modelservice/deployment.yaml
+++ b/charts/llm-d/templates/modelservice/deployment.yaml
@@ -46,11 +46,11 @@ spec:
         - --epp-cluster-role
         - endpoint-picker-clusterrole
         - --epp-pull-secrets
-        - endpoint-picker-pull-secret
+        - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.epp.image) "context" $) }}
         - --pd-cluster-role
         - prefill-decode-clusterrole
         - --pd-pull-secrets
-        - prefill-decode-pull-secret
+        - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.vllm.image) "context" $) }}
         # MSV2 HACK END
         command:
         - /manager
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
deleted file mode 100644
index c78dc14..0000000
--- a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 0925b89..0000000
--- a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-kind: Secret
-apiVersion: v1
-metadata:
-  name: pd-pull-secret