diff --git a/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml b/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
index 196bf5ee..907f8595 100755
--- a/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
+++ b/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
@@ -210,7 +210,8 @@ spec:
           subPath: cacerts
           name: cacerts
         {{- end }}
-      {{- if and (.Values.gitopsHalyard.enabled) (eq .Values.gitopsHalyard.repo.type "git") }}
+      {{- if .Values.gitopsHalyard.enabled }}
+      {{- if or (eq .Values.gitopsHalyard.repo.type "git") (eq .Values.gitopsHalyard.repo.type "s3") }}
       - name: "halyardconfig-update"
         command:
         - sh
@@ -229,6 +230,7 @@ spec:
         - name: secret-decoder
           mountPath: /tmp/akv2k8s
         {{- end }}
+        {{- end }}
       {{- if .Values.gitopsHalyard.enabled }}
       - name: "halyard-overrideurl"
         command:
@@ -284,11 +286,13 @@ spec:
         configMap:
           name: {{ template "spinnaker.fullname" . }}-halyard-overrideurl
       {{- end }}
-      {{- if and (.Values.gitopsHalyard.enabled) (eq .Values.gitopsHalyard.repo.type "git") }}
+      {{- if .Values.gitopsHalyard.enabled }}
+      {{- if or (eq .Values.gitopsHalyard.repo.type "git") (eq .Values.gitopsHalyard.repo.type "s3") }}
       - name: secret-decoder
         configMap:
           name: {{ template "spinnaker.fullname" . }}-spin-secret-decoder
       {{- end }}
+      {{- end }}
       {{- if .Values.gitopsHalyard.mTLS.enabled }}
       - name: sslcerts
         secret: