diff --git a/apps/base/puppet/configmap_puppetboard-config.yaml b/apps/base/puppet/configmap_puppetboard-config.yaml
index f61b620..a9f5740 100644
--- a/apps/base/puppet/configmap_puppetboard-config.yaml
+++ b/apps/base/puppet/configmap_puppetboard-config.yaml
@@ -12,9 +12,7 @@ metadata:
 data:
   PUPPETDB_HOST: "puppetdb"
   PUPPETDB_PORT: "8081"
-  PUPPETDB_SSL_VERIFY: "/opt/puppetboard/ssl/ca.pem"
-  PUPPETDB_KEY: "/opt/puppetboard/ssl/puppetboard.key"
-  PUPPETDB_CERT: "/opt/puppetboard/ssl/puppetboard.pem"
+  PUPPETDB_SSL_SKIP_VERIFY: "True"
   LOGLEVEL: "debug"
   PUPPETDB_TIMEOUT: "20"
   UNRESPONSIVE_HOURS: "3"
diff --git a/apps/base/puppet/deployment_puppetserver-compiler.yaml b/apps/base/puppet/deployment_puppetserver-compiler.yaml
index 93ddedc..bb17410 100644
--- a/apps/base/puppet/deployment_puppetserver-compiler.yaml
+++ b/apps/base/puppet/deployment_puppetserver-compiler.yaml
@@ -39,26 +39,14 @@ spec:
         ports:
         - containerPort: 8140
           name: puppetserver
-        envFrom: null
+        envFrom:
+        - configMapRef:
+            name: puppetserver-compiler-config
         env:
         - name: OPENVOXSERVER_HOSTNAME
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        - name: OPENVOXSERVER_PORT
-          value: "8140"
-        - name: DNS_ALT_NAMES
-          value: puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppet-headless,puppet,puppet.k8s.syd1.au.unkin.net
-        - name: OPENVOXDB_SERVER_URLS
-          value: https://puppetdb:8081
-        - name: CA_ENABLED
-          value: "false"
-        - name: CA_HOSTNAME
-          value: puppetca
-        - name: CA_PORT
-          value: "8140"
-        - name: PUPPETSERVER_JAVA_ARGS
-          value: -Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
         livenessProbe:
           failureThreshold: 3
           periodSeconds: 30
@@ -107,6 +95,36 @@ spec:
           name: eyaml-keys
           readOnly: true
       initContainers:
+      - name: copy-configmaps
+        image: busybox:1.35
+        command:
+        - sh
+        - -c
+        args:
+        - |
+          echo "Copying configmap files to shared volume..."
+          mkdir -p /etc/puppetlabs/puppet
+          cp /configmaps/puppet.conf /etc/puppetlabs/puppet/puppet.conf
+          cp /configmaps/puppetdb.conf /etc/puppetlabs/puppet/puppetdb.conf
+          cp /configmaps/autosign.conf /etc/puppetlabs/puppet/autosign.conf
+          cp /configmaps/cobbler-enc /etc/puppetlabs/puppet/cobbler-enc
+          chmod +x /etc/puppetlabs/puppet/cobbler-enc
+          echo "Configmap files copied successfully"
+        volumeMounts:
+        - mountPath: /etc/puppetlabs/puppet/
+          name: puppet-puppet-volume
+        - mountPath: /configmaps/puppet.conf
+          name: compiler-puppet-conf
+          subPath: puppet.conf
+        - mountPath: /configmaps/puppetdb.conf
+          name: compiler-puppetdb-conf
+          subPath: puppetdb.conf
+        - mountPath: /configmaps/autosign.conf
+          name: compiler-autosign-conf
+          subPath: autosign.conf
+        - mountPath: /configmaps/cobbler-enc
+          name: puppet-cobbler-enc
+          subPath: cobbler-enc
       - args:
         - mkdir -p /etc/puppetlabs/puppet/eyaml/keys;
           mkdir -p /etc/puppetlabs/code/environments;
@@ -170,5 +188,17 @@ spec:
         secret:
           secretName: eyaml-keys
           defaultMode: 0600
+      - name: compiler-puppet-conf
+        configMap:
+          name: compiler-puppet.conf
+      - name: compiler-puppetdb-conf
+        configMap:
+          name: compiler-puppetdb.conf
+      - name: compiler-autosign-conf
+        configMap:
+          name: compiler-autosign.conf
+      - name: puppet-cobbler-enc
+        configMap:
+          name: puppet-cobbler-enc
   strategy:
     type: RollingUpdate
diff --git a/apps/base/puppet/horizontalpodautoscaler_puppetserver-compilers-autoscaler.yaml b/apps/base/puppet/horizontalpodautoscaler_puppetserver-compilers-autoscaler.yaml
index f28e373..cdf4f62 100644
--- a/apps/base/puppet/horizontalpodautoscaler_puppetserver-compilers-autoscaler.yaml
+++ b/apps/base/puppet/horizontalpodautoscaler_puppetserver-compilers-autoscaler.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: StatefulSet
+    kind: Deployment
     name: puppetserver-compiler
   minReplicas: 2
   maxReplicas: 5
diff --git a/apps/base/puppet/kustomization.yaml b/apps/base/puppet/kustomization.yaml
index 684f650..65866d4 100644
--- a/apps/base/puppet/kustomization.yaml
+++ b/apps/base/puppet/kustomization.yaml
@@ -37,12 +37,20 @@ configMapGenerator:
   - name: compiler-autosign.conf
     files:
       - resources/compiler/autosign.conf
+    options:
+      disableNameSuffixHash: true
   - name: compiler-puppet.conf
     files:
       - resources/compiler/puppet.conf
+    options:
+      disableNameSuffixHash: true
   - name: compiler-puppetdb.conf
     files:
       - resources/compiler/puppetdb.conf
+    options:
+      disableNameSuffixHash: true
   - name: puppet-cobbler-enc
     files:
       - resources/cobbler-enc
+    options:
+      disableNameSuffixHash: true