diff --git a/omec/omec-upf-pfcp-agent/templates/secret-registry.yaml b/omec/omec-upf-pfcp-agent/templates/secret-registry.yaml
new file mode 100644
index 0000000..1502049
--- /dev/null
+++ b/omec/omec-upf-pfcp-agent/templates/secret-registry.yaml
@@ -0,0 +1,18 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+{{- if .Values.images.credentials }}
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}.registry
+  labels:
+    release: {{ .Release.Name }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.images.credentials.registry | quote) (printf "%s:%s" .Values.images.credentials.username .Values.images.credentials.password | b64enc) | b64enc | quote }}
+{{- end }}
diff --git a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
index 56f6273..d979dec 100644
--- a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
+++ b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
@@ -28,7 +28,12 @@
       nodeSelector:
         {{ .Values.nodeSelectors.pfcp.label }}: {{ .Values.nodeSelectors.pfcp.value }}
     {{- end }}
+    {{- if .Values.images.credentials }}
+      imagePullSecrets:
+        - name: {{ .Release.Name }}.registry
+    {{- end }}
     {{- if .Values.config.coreDump.enabled }}
+      initContainers:
 {{ tuple "pfcp" . | include "omec-upf-pfcp-agent.coredump_init" | indent 8 }}
     {{- end }}
       containers: