diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
index 9b5e4a0380..4eaa2b43d8 100644
--- a/charts/redpanda/Chart.yaml
+++ b/charts/redpanda/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 5.7.23
+version: 5.7.25
 
 # The app version is the default version of Redpanda to install.
 # ** NOTE for maintainers: please ensure the artifacthub image annotation is updated before merging
diff --git a/charts/redpanda/ci/20-certs-dns-names-values.yaml b/charts/redpanda/ci/20-certs-dns-names-values.yaml
new file mode 100644
index 0000000000..73f1ad88cd
--- /dev/null
+++ b/charts/redpanda/ci/20-certs-dns-names-values.yaml
@@ -0,0 +1,26 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+tls:
+  enabled: true
+  certs:
+    default:
+      issuerRef:
+        name: custom-internal-issuer-ref
+        kind: ClusterIssuer
+
+external:
+  enabled: false
\ No newline at end of file
diff --git a/charts/redpanda/templates/certs.yaml b/charts/redpanda/templates/certs.yaml
index 0621b7117c..81e380420a 100644
--- a/charts/redpanda/templates/certs.yaml
+++ b/charts/redpanda/templates/certs.yaml
@@ -37,7 +37,10 @@ metadata:
       {{- end }}
 spec:
   dnsNames:
-      {{- if (empty $data.issuerRef) }}
+      {{- if (tpl ($values.external.domain | default "") $) }}
+    - "{{ tpl $values.external.domain $ }}"
+    - "*.{{ tpl $values.external.domain $ }}"
+      {{ else }}
     - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc.%s" $service $ns $domain }}
     - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s.svc" $service $ns }}
     - {{ template "redpanda.fullname" $ }}-cluster.{{ printf "%s.%s" $service $ns }}
@@ -51,10 +54,6 @@ spec:
     - {{ printf "*.%s.%s.svc" $service $ns | quote }}
     - {{ printf "*.%s.%s" $service $ns | quote }}
       {{- end }}
-      {{- if (tpl ($values.external.domain | default "") $) }}
-    - "{{ tpl $values.external.domain $ }}"
-    - "*.{{ tpl $values.external.domain $ }}"
-      {{- end }}
   duration: {{ $d | default "43800h" }}
   isCA: false
   secretName: {{ template "redpanda.fullname" $ }}-{{ $name }}-cert
@@ -103,4 +102,4 @@ spec:
     group: cert-manager.io
   {{- end }}
   {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file