diff --git a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
index fad66f2..2f3decd 100644
--- a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
+++ b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml
@@ -11,7 +11,7 @@ metadata:
   namespace: puppet
 data:
   OPENVOXSERVER_PORT: "8140"
-  DNS_ALT_NAMES: "puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppetserver-compiler,puppet,puppet.k8s.syd1.au.unkin.net"
+  DNS_ALT_NAMES: "puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppet,puppet.k8s.syd1.au.unkin.net"
   OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
   CA_ENABLED: "false"
   CA_HOSTNAME: "puppetca"
diff --git a/apps/base/puppet/configmap_puppetserver-master-config.yaml b/apps/base/puppet/configmap_puppetserver-master-config.yaml
index 1eddd51..2bf4ce7 100644
--- a/apps/base/puppet/configmap_puppetserver-master-config.yaml
+++ b/apps/base/puppet/configmap_puppetserver-master-config.yaml
@@ -12,7 +12,7 @@ metadata:
 data:
   OPENVOXSERVER_HOSTNAME: "puppet"
   OPENVOXSERVER_PORT: "8140"
-  DNS_ALT_NAMES: "puppet,puppetserver-agents-to-puppet,puppetca,puppet-compilers,puppetca.k8s.syd1.au.unkin.net,puppet.k8s.syd1.au.unkin.net"
+  DNS_ALT_NAMES: "puppet,puppetserver-agents-to-puppet,puppetca,puppet-headless,puppetca.k8s.syd1.au.unkin.net,puppet.k8s.syd1.au.unkin.net"
   OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
   CA_ALLOW_SUBJECT_ALT_NAMES: "true"
   PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
diff --git a/apps/base/puppet/deployment_puppetdb.yaml b/apps/base/puppet/deployment_puppetdb.yaml
index 7c01213..84551bd 100644
--- a/apps/base/puppet/deployment_puppetdb.yaml
+++ b/apps/base/puppet/deployment_puppetdb.yaml
@@ -126,7 +126,7 @@ spec:
             - -c
             - |
               echo 'Waiting for puppetserver to become ready...'
-              until printf "." && curl --silent --fail --insecure 'https://puppetserver-puppet:8140/status/v1/simple' | grep -q '^running$'; do
+              until printf "." && curl --silent --fail --insecure 'https://puppetca:8140/status/v1/simple' | grep -q '^running$'; do
                 sleep 2;
               done;
               echo 'Puppetserver OK ✓'
diff --git a/apps/base/puppet/ingress_puppetserver-compilers.yaml b/apps/base/puppet/ingress_puppet.yaml
similarity index 91%
rename from apps/base/puppet/ingress_puppetserver-compilers.yaml
rename to apps/base/puppet/ingress_puppet.yaml
index 70ed43c..81af398 100644
--- a/apps/base/puppet/ingress_puppetserver-compilers.yaml
+++ b/apps/base/puppet/ingress_puppet.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
-  name: puppetserver-compiler
+  name: puppet
   namespace: puppet
 spec:
   rules:
@@ -21,7 +21,7 @@ spec:
         paths:
           - backend:
               service:
-                name: puppetserver-compiler
+                name: puppet
                 port:
                   number: 8140
             path: /
diff --git a/apps/base/puppet/ingress_puppetboard.yaml b/apps/base/puppet/ingress_puppetboard.yaml
index 38f86b4..c0fff40 100644
--- a/apps/base/puppet/ingress_puppetboard.yaml
+++ b/apps/base/puppet/ingress_puppetboard.yaml
@@ -14,7 +14,7 @@ metadata:
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
-  name: puppetserver-puppetboard
+  name: puppetboard
   namespace: puppet
 spec:
   rules:
diff --git a/apps/base/puppet/ingress_puppetserver-masters.yaml b/apps/base/puppet/ingress_puppetca.yaml
similarity index 91%
rename from apps/base/puppet/ingress_puppetserver-masters.yaml
rename to apps/base/puppet/ingress_puppetca.yaml
index f8a20ef..02ccf3c 100644
--- a/apps/base/puppet/ingress_puppetserver-masters.yaml
+++ b/apps/base/puppet/ingress_puppetca.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
-  name: puppetserver-masters
+  name: puppetca
   namespace: puppet
 spec:
   rules:
@@ -21,7 +21,7 @@ spec:
         paths:
           - backend:
               service:
-                name: puppetserver-puppet
+                name: puppetca
                 port:
                   number: 8140
             path: /
diff --git a/apps/base/puppet/kustomization.yaml b/apps/base/puppet/kustomization.yaml
index 28bea5e..353e9f6 100644
--- a/apps/base/puppet/kustomization.yaml
+++ b/apps/base/puppet/kustomization.yaml
@@ -25,12 +25,12 @@ resources:
   - horizontalpodautoscaler_puppetserver-puppetdb-autoscaler.yaml
   - ingress_puppetboard.yaml
   - ingress_puppetdb.yaml
-  - ingress_puppetserver-compilers.yaml
-  - ingress_puppetserver-masters.yaml
+  - ingress_puppet.yaml
+  - ingress_puppetca.yaml
   - service_puppetserver-agents-to-puppet.yaml
-  - service_puppetserver-puppet-compilers-headless.yaml
-  - service_puppetserver-puppet-compilers.yaml
-  - service_puppetserver-puppet.yaml
-  - service_puppetserver-puppetboard.yaml
-  - service_puppetserver-puppetdb.yaml
+  - service_puppet-headless.yaml
+  - service_puppet.yaml
+  - service_puppetca.yaml
+  - service_puppetboard.yaml
+  - service_puppetdb.yaml
   - statefulset_puppetserver-compiler.yaml
diff --git a/apps/base/puppet/service_puppetserver-puppet-compilers-headless.yaml b/apps/base/puppet/service_puppet-headless.yaml
similarity index 92%
rename from apps/base/puppet/service_puppetserver-puppet-compilers-headless.yaml
rename to apps/base/puppet/service_puppet-headless.yaml
index aad7609..4522c34 100644
--- a/apps/base/puppet/service_puppetserver-puppet-compilers-headless.yaml
+++ b/apps/base/puppet/service_puppet-headless.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
-  name: puppetserver-compiler-headless
+  name: puppet-headless
   namespace: puppet
 spec:
   clusterIP: None
diff --git a/apps/base/puppet/service_puppetserver-puppet-compilers.yaml b/apps/base/puppet/service_puppet.yaml
similarity index 93%
rename from apps/base/puppet/service_puppetserver-puppet-compilers.yaml
rename to apps/base/puppet/service_puppet.yaml
index e85409b..6ac0719 100644
--- a/apps/base/puppet/service_puppetserver-puppet-compilers.yaml
+++ b/apps/base/puppet/service_puppet.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
-  name: puppetserver-compiler
+  name: puppet
   namespace: puppet
 spec:
   ports:
diff --git a/apps/base/puppet/service_puppetserver-puppetboard.yaml b/apps/base/puppet/service_puppetboard.yaml
similarity index 100%
rename from apps/base/puppet/service_puppetserver-puppetboard.yaml
rename to apps/base/puppet/service_puppetboard.yaml
diff --git a/apps/base/puppet/service_puppetserver-puppet.yaml b/apps/base/puppet/service_puppetca.yaml
similarity index 75%
rename from apps/base/puppet/service_puppetserver-puppet.yaml
rename to apps/base/puppet/service_puppetca.yaml
index 2be6049..2e52928 100644
--- a/apps/base/puppet/service_puppetserver-puppet.yaml
+++ b/apps/base/puppet/service_puppetca.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: puppetserver
+    app.kubernetes.io/component: puppetserver-master
     app.kubernetes.io/instance: puppetserver
     app.kubernetes.io/name: puppetserver
     app.kubernetes.io/version: 8.8.0
@@ -13,6 +13,6 @@ spec:
   - name: puppetserver
     port: 8140
   selector:
-    app.kubernetes.io/component: puppetserver
+    app.kubernetes.io/component: puppetserver-master
     app.kubernetes.io/name: puppetserver
   type: ClusterIP
diff --git a/apps/base/puppet/service_puppetserver-puppetdb.yaml b/apps/base/puppet/service_puppetdb.yaml
similarity index 100%
rename from apps/base/puppet/service_puppetserver-puppetdb.yaml
rename to apps/base/puppet/service_puppetdb.yaml
diff --git a/apps/base/puppet/statefulset_puppetserver-compiler.yaml b/apps/base/puppet/statefulset_puppetserver-compiler.yaml
index 359249a..d378eae 100644
--- a/apps/base/puppet/statefulset_puppetserver-compiler.yaml
+++ b/apps/base/puppet/statefulset_puppetserver-compiler.yaml
@@ -16,7 +16,7 @@ spec:
     matchLabels:
       app.kubernetes.io/component: puppetserver-compilers
       app.kubernetes.io/name: puppetserver
-  serviceName: puppet-compilers-headless
+  serviceName: puppet-headless
   template:
     metadata:
       labels:
@@ -49,7 +49,7 @@ spec:
         - 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-compilers,puppet,puppet.k8s.syd1.au.unkin.net
+          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