diff --git a/templates/job-create-gpg.yaml b/templates/job-create-gpg.yaml
index 2ea8f64..98bdcb3 100644
--- a/templates/job-create-gpg.yaml
+++ b/templates/job-create-gpg.yaml
@@ -83,9 +83,9 @@ spec:
             {{- end }}
           envFrom:
             - configMapRef:
-                name: {{ $Name }}-cm-env
+                name: {{ default (printf "%s-cm-env" $Name) .Values.passboltEnv.configMapName }}
             - secretRef:
-                name: {{ $Name }}-sec-env
+                name: {{ default (printf "%s-sec-env" $Name) .Values.passboltEnv.secretName }}
             {{- with .Values.passboltEnv.extraEnvFrom }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
diff --git a/templates/job-create-jwt.yaml b/templates/job-create-jwt.yaml
index 456fd23..2dbbed1 100644
--- a/templates/job-create-jwt.yaml
+++ b/templates/job-create-jwt.yaml
@@ -61,9 +61,9 @@ spec:
             {{- end }}
           envFrom:
             - configMapRef:
-                name: {{ $Name }}-cm-env
+                name: {{ default (printf "%s-cm-env" $Name) .Values.passboltEnv.configMapName }}
             - secretRef:
-                name: {{ $Name }}-sec-env
+                name: {{ default (printf "%s-sec-env" $Name) .Values.passboltEnv.secretName }}
             {{- with .Values.passboltEnv.extraEnvFrom }}
             {{- toYaml . | nindent 12 }}
             {{- end }}