diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index 61df222eb..021dfe798 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -1,5 +1,5 @@
 namespace: datatracker
-namePrefix: datatracker-
+namePrefix: dt-
 configMapGenerator:
   - name: files-cfgmap
     files:
diff --git a/k8s/rabbitmq.yaml b/k8s/rabbitmq.yaml
index c5a823ac2..465577121 100644
--- a/k8s/rabbitmq.yaml
+++ b/k8s/rabbitmq.yaml
@@ -76,7 +76,8 @@ spec:
             runAsGroup: 101
       volumes:
         - name: rabbitmq-data
-          # TODO: TODO TODO
+          persistentVolumeClaim:
+            claimName: "rabbitmq-data-vol"
         - name: rabbitmq-tmp
           emptyDir:
             sizeLimit: "50Mi"
@@ -86,6 +87,16 @@ spec:
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
+  volumeClaimTemplates:
+  - metadata:
+      name: rabbitmq-data-vol
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 8Gi
+      # storageClassName: ""
 ---
 apiVersion: v1
 kind: ConfigMap