diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml
index eb2f3d0..96e70c3 100644
--- a/templates/configmap-env.yaml
+++ b/templates/configmap-env.yaml
@@ -351,12 +351,12 @@ data:
 
   {{- if .Values.mastodon.cacheBuster.enabled }}
   CACHE_BUSTER_ENABLED: "true"
+    {{- if .Values.mastodon.cacheBuster.httpMethod }}
+  CACHE_BUSTER_HTTP_METHOD: {{ .Values.mastodon.cacheBuster.httpMethod }}
+    {{- end }}
+    {{- if .Values.mastodon.cacheBuster.authHeader }}
+  CACHE_BUSTER_SECRET_HEADER: {{ .Values.mastodon.cacheBuster.authHeader }}
+    {{- end }}
   {{- else }}
   CACHE_BUSTER_ENABLED: "false"
   {{- end }}
-  {{- if .Values.mastodon.cacheBuster.httpMethod }}
-  CACHE_BUSTER_HTTP_METHOD: {{ .Values.mastodon.cacheBuster.httpMethod }}
-  {{- end }}
-  {{- if .Values.mastodon.cacheBuster.authHeader }}
-  CACHE_BUSTER_SECRET_HEADER: {{ .Values.mastodon.cacheBuster.authHeader }}
-  {{- end }}
diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index 5a189ae..f71e104 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -135,7 +135,7 @@ spec:
                   name: {{ $context.Values.mastodon.deepl.apiKeySecretRef.name }}
                   key: {{ $context.Values.mastodon.deepl.apiKeySecretRef.key }}
             {{- end }}
-            {{- if $context.Values.mastodon.cacheBuster.authToken.existingSecret }}
+            {{- if and $context.Values.mastodon.cacheBuster.enabled $context.Values.mastodon.cacheBuster.authToken.existingSecret }}
             - name: CACHE_BUSTER_SECRET
               valueFrom:
                 secretKeyRef:
diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
index 2e4e25d..1321cb8 100644
--- a/templates/deployment-web.yaml
+++ b/templates/deployment-web.yaml
@@ -130,7 +130,7 @@ spec:
                   name: {{ .Values.mastodon.hcaptcha.secretKeySecretRef.name }}
                   key: {{ .Values.mastodon.hcaptcha.secretKeySecretRef.key }}
             {{- end }}
-            {{- if .Values.mastodon.cacheBuster.authToken.existingSecret }}
+            {{- if and .Values.mastodon.cacheBuster.enabled .Values.mastodon.cacheBuster.authToken.existingSecret }}
             - name: CACHE_BUSTER_SECRET
               valueFrom:
                 secretKeyRef: