diff --git a/premium/clusterissuer/8.0.6/.helmignore b/premium/clusterissuer/8.0.8/.helmignore
similarity index 100%
rename from premium/clusterissuer/8.0.6/.helmignore
rename to premium/clusterissuer/8.0.8/.helmignore
diff --git a/premium/clusterissuer/8.0.6/CHANGELOG.md b/premium/clusterissuer/8.0.8/CHANGELOG.md
similarity index 100%
rename from premium/clusterissuer/8.0.6/CHANGELOG.md
rename to premium/clusterissuer/8.0.8/CHANGELOG.md
diff --git a/premium/clusterissuer/8.0.6/Chart.yaml b/premium/clusterissuer/8.0.8/Chart.yaml
similarity index 98%
rename from premium/clusterissuer/8.0.6/Chart.yaml
rename to premium/clusterissuer/8.0.8/Chart.yaml
index ac4f41e7dde..09c9e5d6252 100644
--- a/premium/clusterissuer/8.0.6/Chart.yaml
+++ b/premium/clusterissuer/8.0.8/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.6
+version: 8.0.8
diff --git a/premium/clusterissuer/8.0.6/README.md b/premium/clusterissuer/8.0.8/README.md
similarity index 100%
rename from premium/clusterissuer/8.0.6/README.md
rename to premium/clusterissuer/8.0.8/README.md
diff --git a/premium/clusterissuer/8.0.6/app-changelog.md b/premium/clusterissuer/8.0.8/app-changelog.md
similarity index 90%
rename from premium/clusterissuer/8.0.6/app-changelog.md
rename to premium/clusterissuer/8.0.8/app-changelog.md
index 5ada4cd50c9..c86278981cd 100644
--- a/premium/clusterissuer/8.0.6/app-changelog.md
+++ b/premium/clusterissuer/8.0.8/app-changelog.md
@@ -1,17 +1,19 @@
 
 
-## [clusterissuer-8.0.6](https://github.com/truecharts/charts/compare/clusterissuer-7.6.0...clusterissuer-8.0.6) (2024-05-06)
+## [clusterissuer-8.0.8](https://github.com/truecharts/charts/compare/clusterissuer-7.6.0...clusterissuer-8.0.8) (2024-05-18)
 
 ### Chore
 
 
 
+- bump charts to ensure new icons are released
+
+- update docs links
+
 - bump common to release improved checks on volsync and cnpg ([#21454](https://github.com/truecharts/charts/issues/21454))
 
 - bump common
 
-- bump charts to ensure new icons are released
-
 - bump everything to release new doc pages
 
 - update groups html ([#21121](https://github.com/truecharts/charts/issues/21121))
@@ -20,44 +22,44 @@
 
 - bump everything to regenerate readme's and site index
 
-- update docs links
-
 - apply hotfix
 
-- update container image common to v20.3.7[@8cf9fc9](https://github.com/8cf9fc9) by renovate ([#20819](https://github.com/truecharts/charts/issues/20819))
-
-- update container image common to v20.2.4[@f245f5c](https://github.com/f245f5c) by renovate ([#19731](https://github.com/truecharts/charts/issues/19731))
-
-- update container image common to v20.3.12[@3303278](https://github.com/3303278) by renovate ([#21384](https://github.com/truecharts/charts/issues/21384))
-
-- update container image hello-world to latest[@a26bff9](https://github.com/a26bff9) by renovate ([#19264](https://github.com/truecharts/charts/issues/19264))
-
 - update container image common to v20.2.0[@91ade87](https://github.com/91ade87) by renovate ([#19361](https://github.com/truecharts/charts/issues/19361))
 
-- update container image common to v20.2.2[@f7d0b92](https://github.com/f7d0b92) by renovate ([#19432](https://github.com/truecharts/charts/issues/19432))
+- update container image common to v20.3.4[@d7e1b23](https://github.com/d7e1b23) by renovate ([#20527](https://github.com/truecharts/charts/issues/20527))
+
+- update container image common to v20.3.12[@3303278](https://github.com/3303278) by renovate ([#21384](https://github.com/truecharts/charts/issues/21384))
+
+- update container image hello-world to latest[@266b191](https://github.com/266b191) by renovate ([#22120](https://github.com/truecharts/charts/issues/22120))
+
+- update container image hello-world to latest[@a26bff9](https://github.com/a26bff9) by renovate ([#19264](https://github.com/truecharts/charts/issues/19264))
+
+- update container image common to v20.2.10[@6f99c97](https://github.com/6f99c97) by renovate ([#19876](https://github.com/truecharts/charts/issues/19876))
+
+- update container image common to v20.3.7[@8cf9fc9](https://github.com/8cf9fc9) by renovate ([#20819](https://github.com/truecharts/charts/issues/20819))
 
 - update container image common to v20.3.6[@27edfed](https://github.com/27edfed) by renovate ([#20599](https://github.com/truecharts/charts/issues/20599))
 
 - update container image common to v20.3.5[@aedd88a](https://github.com/aedd88a) by renovate ([#20535](https://github.com/truecharts/charts/issues/20535))
 
-- update container image common to v20.3.4[@d7e1b23](https://github.com/d7e1b23) by renovate ([#20527](https://github.com/truecharts/charts/issues/20527))
+- update container image common to v20.3.11[@dae6129](https://github.com/dae6129) by renovate ([#20875](https://github.com/truecharts/charts/issues/20875))
 
 - update container image common to v20.3.3[@3876ba5](https://github.com/3876ba5) by renovate ([#20478](https://github.com/truecharts/charts/issues/20478))
 
 - update container image common to v20.3.2[@0722ebb](https://github.com/0722ebb) by renovate ([#20334](https://github.com/truecharts/charts/issues/20334))
 
-- update container image common to v20.2.10[@6f99c97](https://github.com/6f99c97) by renovate ([#19876](https://github.com/truecharts/charts/issues/19876))
+- update container image common to v20.2.2[@f7d0b92](https://github.com/f7d0b92) by renovate ([#19432](https://github.com/truecharts/charts/issues/19432))
 
 - update container image common to v20.2.9[@10fd6c5](https://github.com/10fd6c5) by renovate ([#19817](https://github.com/truecharts/charts/issues/19817))
 
-- update container image common to v20.3.11[@dae6129](https://github.com/dae6129) by renovate ([#20875](https://github.com/truecharts/charts/issues/20875))
+- update container image common to v20.2.4[@f245f5c](https://github.com/f245f5c) by renovate ([#19731](https://github.com/truecharts/charts/issues/19731))
 
 - update container image common to v20.2.3[@06e462e](https://github.com/06e462e) by renovate ([#19673](https://github.com/truecharts/charts/issues/19673))
 
-- make links relative
-
 - Fix broken links for Starlight ([#20737](https://github.com/truecharts/charts/issues/20737))
 
+- make links relative
+
 ### Chore
 
 
@@ -84,6 +86,8 @@
 
 - adapt for common cnpg/volsync pathing changes ([#21445](https://github.com/truecharts/charts/issues/21445))
 
+- fix var scope ([#22216](https://github.com/truecharts/charts/issues/22216))
+
 - fix default issuer ([#21446](https://github.com/truecharts/charts/issues/21446))
 
 - Allow entering explicit cert-manager namespace for now
diff --git a/premium/clusterissuer/8.0.6/app-readme.md b/premium/clusterissuer/8.0.8/app-readme.md
similarity index 100%
rename from premium/clusterissuer/8.0.6/app-readme.md
rename to premium/clusterissuer/8.0.8/app-readme.md
diff --git a/premium/clusterissuer/8.0.6/charts/common-23.0.0.tgz b/premium/clusterissuer/8.0.8/charts/common-23.0.0.tgz
similarity index 100%
rename from premium/clusterissuer/8.0.6/charts/common-23.0.0.tgz
rename to premium/clusterissuer/8.0.8/charts/common-23.0.0.tgz
diff --git a/premium/clusterissuer/8.0.6/icon-small.webp b/premium/clusterissuer/8.0.8/icon-small.webp
similarity index 100%
rename from premium/clusterissuer/8.0.6/icon-small.webp
rename to premium/clusterissuer/8.0.8/icon-small.webp
diff --git a/premium/clusterissuer/8.0.6/icon.webp b/premium/clusterissuer/8.0.8/icon.webp
similarity index 100%
rename from premium/clusterissuer/8.0.6/icon.webp
rename to premium/clusterissuer/8.0.8/icon.webp
diff --git a/premium/clusterissuer/8.0.6/ix_values.yaml b/premium/clusterissuer/8.0.8/ix_values.yaml
similarity index 96%
rename from premium/clusterissuer/8.0.6/ix_values.yaml
rename to premium/clusterissuer/8.0.8/ix_values.yaml
index 4882b38c36b..31f45d9f3d9 100644
--- a/premium/clusterissuer/8.0.6/ix_values.yaml
+++ b/premium/clusterissuer/8.0.8/ix_values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: hello-world
-  tag: latest@sha256:a26bff933ddc26d5cdf7faa98b4ae1e3ec20c4985e6f87ac0973052224d24302
+  tag: latest@sha256:266b191e926f65542fa8daaec01a192c4d292bff79426f47300a046e1bc576fd
   pullPolicy: IfNotPresent
 manifestManager:
   enabled: true
diff --git a/premium/clusterissuer/8.0.6/questions.yaml b/premium/clusterissuer/8.0.8/questions.yaml
similarity index 100%
rename from premium/clusterissuer/8.0.6/questions.yaml
rename to premium/clusterissuer/8.0.8/questions.yaml
diff --git a/premium/clusterissuer/8.0.6/templates/NOTES.txt b/premium/clusterissuer/8.0.8/templates/NOTES.txt
similarity index 100%
rename from premium/clusterissuer/8.0.6/templates/NOTES.txt
rename to premium/clusterissuer/8.0.8/templates/NOTES.txt
diff --git a/premium/clusterissuer/8.0.6/templates/clusterissuer/_ACME.tpl b/premium/clusterissuer/8.0.8/templates/clusterissuer/_ACME.tpl
similarity index 90%
rename from premium/clusterissuer/8.0.6/templates/clusterissuer/_ACME.tpl
rename to premium/clusterissuer/8.0.8/templates/clusterissuer/_ACME.tpl
index e49a071c590..82db307cb09 100644
--- a/premium/clusterissuer/8.0.6/templates/clusterissuer/_ACME.tpl
+++ b/premium/clusterissuer/8.0.8/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
diff --git a/premium/clusterissuer/8.0.6/templates/clusterissuer/_CA.tpl b/premium/clusterissuer/8.0.8/templates/clusterissuer/_CA.tpl
similarity index 100%
rename from premium/clusterissuer/8.0.6/templates/clusterissuer/_CA.tpl
rename to premium/clusterissuer/8.0.8/templates/clusterissuer/_CA.tpl
diff --git a/premium/clusterissuer/8.0.6/templates/clusterissuer/_clusterCertificates.tpl b/premium/clusterissuer/8.0.8/templates/clusterissuer/_clusterCertificates.tpl
similarity index 100%
rename from premium/clusterissuer/8.0.6/templates/clusterissuer/_clusterCertificates.tpl
rename to premium/clusterissuer/8.0.8/templates/clusterissuer/_clusterCertificates.tpl
diff --git a/premium/clusterissuer/8.0.6/templates/clusterissuer/_selfSigned.tpl b/premium/clusterissuer/8.0.8/templates/clusterissuer/_selfSigned.tpl
similarity index 100%
rename from premium/clusterissuer/8.0.6/templates/clusterissuer/_selfSigned.tpl
rename to premium/clusterissuer/8.0.8/templates/clusterissuer/_selfSigned.tpl
diff --git a/premium/clusterissuer/8.0.6/templates/common.yaml b/premium/clusterissuer/8.0.8/templates/common.yaml
similarity index 100%
rename from premium/clusterissuer/8.0.6/templates/common.yaml
rename to premium/clusterissuer/8.0.8/templates/common.yaml
diff --git a/premium/clusterissuer/8.0.6/values.yaml b/premium/clusterissuer/8.0.8/values.yaml
similarity index 100%
rename from premium/clusterissuer/8.0.6/values.yaml
rename to premium/clusterissuer/8.0.8/values.yaml