diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1635bf..d7e91db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ This file documents all notable changes to Puppet Server Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version `v0.2.4` is auto-generated.
+## [v9.5.2](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v9.5.2) (2024-06-18)
+- Fix: #233 - Allow puppetdb.fqdns.alternateServerNames to be configured
 
 ## [v9.5.1](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v9.5.1) (2024-05-09)
 - Fix: #228 - fixed check for puppet certs in a multimaster setup
diff --git a/Chart.yaml b/Chart.yaml
index e0cf7c4..f95d134 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: puppetserver
-version: 9.5.1
+version: 9.5.2
 appVersion: 7.17.0
 description: Puppet automates the delivery and operation of software.
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
diff --git a/README.md b/README.md
index 8c3a766..fc6f6d3 100644
--- a/README.md
+++ b/README.md
@@ -414,6 +414,7 @@ The following table lists the configurable parameters of the Puppetserver chart
 | `puppetdb.extraEnv` | puppetdb additional container env vars |``|
 | `puppetdb.extraEnvSecret` | puppetdb additional container env vars from pre-existing secret |``|
 | `puppetdb.extraLabels` | puppetdb additional labels |``|
+| `puppetdb.fqdns.alternateServerNames` | puppetdb alternate fqdns |``|
 | `puppetdb.service.type` | define `spec.type` for the puppetdb service |`ClusterIP`|
 | `puppetdb.service.annotations` | puppetdb service annotations |``|
 | `puppetdb.service.labels` | puppetdb service labels |``|
@@ -598,3 +599,4 @@ kill %[job_numbers_above]
 * [Ben Feld](https://github.com/rootshellz), Contributor
 * [Julien Godin](https://github.com/JGodin-C2C), Contributor
 * [Diego Abelenda](https://github.com/dabelenda), Contributor
+* [Johann Agnarsson](https://github.com/johannagnarsson), Contributor
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 3a1e0c3..50f36d2 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -690,6 +690,17 @@ If release name contains chart name it will be used as a full name.
 {{ template "puppetserver.fullname" . }}-puppetdb
 {{- end -}}
 
+{{/*
+Define puppetdb alternate SAN
+*/}}
+{{- define "puppetdb.san" -}}
+{{- $san := printf "puppetdb,%s" ( include "puppetdb.fullname" . ) -}}
+{{- if .Values.puppetdb.fqdns.alternateServerNames -}}
+{{- $san = print $san "," .Values.puppetdb.fqdns.alternateServerNames -}}
+{{- end -}}
+{{- printf "%s" $san -}}
+{{- end -}}
+
 {{/*
 Define puppetdb service Account name
 */}}
diff --git a/templates/puppetdb-deployment.yaml b/templates/puppetdb-deployment.yaml
index d17e1cf..0cec321 100644
--- a/templates/puppetdb-deployment.yaml
+++ b/templates/puppetdb-deployment.yaml
@@ -111,7 +111,7 @@ spec:
             - name: PUPPETSERVER_PORT
               value: "{{ template "puppetserver.puppetserver-masters.port" . }}"
             - name: DNS_ALT_NAMES
-              value: {{ template "puppetdb.fullname" . }}
+              value: {{ template "puppetdb.san" . }}
             {{- if not (hasKey .Values.puppetdb.extraEnv "PUPPETDB_POSTGRES_HOSTNAME") }}
             - name: PUPPETDB_POSTGRES_HOSTNAME
               value: "{{ include "postgresql.hostname" . }}"
diff --git a/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap b/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap
index 66eef5f..ff53255 100644
--- a/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap
+++ b/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
         release: kube-prometheus-stack
       name: puppetserver-jmx
       namespace: puppet
diff --git a/tests/__snapshot__/puppetdb-pvc_test.yaml.snap b/tests/__snapshot__/puppetdb-pvc_test.yaml.snap
index bea69a0..8b9b03f 100644
--- a/tests/__snapshot__/puppetdb-pvc_test.yaml.snap
+++ b/tests/__snapshot__/puppetdb-pvc_test.yaml.snap
@@ -10,7 +10,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetdb-claim
     spec:
       accessModes:
diff --git a/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap b/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap
index 62b4447..fc14d3f 100644
--- a/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap
+++ b/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
         release: kube-prometheus-stack
       name: puppetserver-puppetdb
       namespace: puppet
diff --git a/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap
index 14a80cc..fd9d055 100644
--- a/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap
+++ b/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetdb
     spec:
       egress:
diff --git a/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap b/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap
index bca8706..15baedf 100644
--- a/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap
@@ -10,7 +10,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-ca-claim
     spec:
       accessModes:
diff --git a/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap
index 8c316e2..3705363 100644
--- a/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetserver-compiler
     spec:
       replicas: 1
@@ -31,7 +31,7 @@ manifest should match snapshot:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: puppetserver
             app.kubernetes.io/version: 7.17.0
-            helm.sh/chart: puppetserver-9.5.1
+            helm.sh/chart: puppetserver-9.5.2
         spec:
           containers:
             - env:
diff --git a/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap
index f5cf18e..4e0304b 100644
--- a/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetserver-compilers
     spec:
       egress:
diff --git a/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap
index 5d92484..2955e7d 100644
--- a/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-compilers
     spec:
       maxUnavailable: 2
diff --git a/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap
index 6469923..709d22d 100644
--- a/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetserver-compiler
     spec:
       podManagementPolicy: OrderedReady
@@ -32,7 +32,7 @@ manifest should match snapshot:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: puppetserver
             app.kubernetes.io/version: 7.17.0
-            helm.sh/chart: puppetserver-9.5.1
+            helm.sh/chart: puppetserver-9.5.2
         spec:
           containers:
             - env:
diff --git a/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap
index f2171d3..423b145 100644
--- a/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppetserver
     spec:
       egress:
diff --git a/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap b/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap
index e25fb8b..9ca2324 100644
--- a/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap
@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-masters
     spec:
       maxUnavailable: 2
diff --git a/tests/__snapshot__/puppetserver-pvc_test.yaml.snap b/tests/__snapshot__/puppetserver-pvc_test.yaml.snap
index 76ae87c..1153a25 100644
--- a/tests/__snapshot__/puppetserver-pvc_test.yaml.snap
+++ b/tests/__snapshot__/puppetserver-pvc_test.yaml.snap
@@ -10,7 +10,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 7.17.0
-        helm.sh/chart: puppetserver-9.5.1
+        helm.sh/chart: puppetserver-9.5.2
       name: puppetserver-puppet-claim
     spec:
       accessModes:
diff --git a/values.yaml b/values.yaml
index e949b6c..b268b9f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -883,6 +883,11 @@ puppetdb:
   psp:
     create: false
     annotations:
+  ## Additional fully qualified domain names (FQDN's) to add
+  ## to the PuppetDB certificates.
+  fqdns:
+    alternateServerNames: ""   # Comma-separated
+
 
 ## PostgreSQL Sub-Chart Configuration
 ## Please check: https://github.com/bitnami/charts/tree/master/bitnami/postgresql