diff --git a/apps/base/puppet/deployment_puppetdb.yaml b/apps/base/puppet/deployment_puppetdb.yaml
index 2c08999..1e93c80 100644
--- a/apps/base/puppet/deployment_puppetdb.yaml
+++ b/apps/base/puppet/deployment_puppetdb.yaml
@@ -49,6 +49,10 @@ spec:
             - configMapRef:
                 name: puppetdb-config
           env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
             - name: OPENVOXDB_POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -88,6 +92,7 @@ spec:
           volumeMounts:
             - mountPath: /opt/puppetlabs/server/data/puppetdb
               name: puppetdb-storage
+              subPathExpr: $(POD_NAME)
             - mountPath: /etc/puppetlabs/puppetdb/conf.d/read-database.conf
               name: puppetdb-read-database-conf
               subPath: read-database.conf
@@ -99,6 +104,11 @@ spec:
             - -c
           args:
             - mkdir -p /opt/puppetlabs/server/data/puppetdb/logs && chown 999:999 /opt/puppetlabs/server/data/puppetdb/logs
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           resources:
             limits:
               cpu: 20m
@@ -111,6 +121,7 @@ spec:
           volumeMounts:
             - mountPath: /opt/puppetlabs/server/data/puppetdb
               name: puppetdb-storage
+              subPathExpr: $(POD_NAME)
 
         - name: pgchecker
           image: docker.io/busybox:1.37