diff --git a/charts/premium/clusterissuer/Chart.yaml b/charts/premium/clusterissuer/Chart.yaml
index be698b4bd69..09c9e5d6252 100644
--- a/charts/premium/clusterissuer/Chart.yaml
+++ b/charts/premium/clusterissuer/Chart.yaml
@@ -34,4 +34,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/premium/clusterissuer
   - https://hub.docker.com/_/hello-world
 type: application
-version: 8.0.7
+version: 8.0.8
diff --git a/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl b/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl
index e49a071c590..82db307cb09 100644
--- a/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl
+++ b/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl
@@ -2,15 +2,15 @@
 {{- $operator := index $.Values.operator "cert-manager" -}}
 {{- $namespace := $operator.namespace | default "cert-manager" -}}
 
-{{- $rfctsigSecret := .rfctsigSecret | default "" -}}
-{{/* https://cert-manager.io/docs/configuration/acme/dns01/rfc2136/#troubleshooting */}}
-{{- if $rfctsigSecret -}} {{/* If we try to decode and fail, go on and encode it. */}}
-  {{- if (contains "illegal base64" (b64dec $rfctsigSecret)) -}}
-    {{- $rfctsigSecret = b64enc $rfctsigSecret -}}
-  {{- end -}}
-{{- end -}}
-
 {{- range .Values.clusterIssuer.ACME }}
+  {{- $rfctsigSecret := .rfctsigSecret | default "" -}}
+  {{/* https://cert-manager.io/docs/configuration/acme/dns01/rfc2136/#troubleshooting */}}
+  {{- if $rfctsigSecret -}} {{/* If we try to decode and fail, go on and encode it. */}}
+    {{- if (contains "illegal base64" (b64dec $rfctsigSecret)) -}}
+      {{- $rfctsigSecret = b64enc $rfctsigSecret -}}
+    {{- end -}}
+  {{- end -}}
+
   {{- if or (not .name) (not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name)) -}}
     {{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
   {{- end -}}
@@ -18,13 +18,13 @@
   {{- if not (mustHas .type $validTypes) -}}
     {{- fail (printf "Expected ACME type to be one of [%s], but got [%s]" (join ", " $validTypes) .type) -}}
   {{- end -}}
-  {{- $issuerSecretName := printf "%s-clusterissuer-secret" .name }}
+  {{- $issuerSecretName := printf "%s-clusterissuer-secret" .name -}}
   {{- $acmednsDict := dict -}}
   {{- if and (eq .type "acmedns") (not .acmednsConfigJson) }}
-    {{- range .acmednsConfig }}
+    {{- range .acmednsConfig -}}
       {{/* Transform to a dict with domain as a key, also remove domain from the dict */}}
       {{- $_ := set $acmednsDict .domain (omit . "domain") -}}
-    {{- end }}
+    {{- end -}}
   {{- end }}
 ---
 apiVersion: cert-manager.io/v1