diff --git a/rabbitmq/rabbitmq.yaml b/rabbitmq/rabbitmq.yaml
index b6f02db..72de625 100644
--- a/rabbitmq/rabbitmq.yaml
+++ b/rabbitmq/rabbitmq.yaml
@@ -1,19 +1,4 @@
 apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: rabbitmq
-  labels:
-    app.kubernetes.io/name: rabbitmq
-    app.kubernetes.io/component: rabbitmq
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
-
----
-apiVersion: v1
 kind: Service
 metadata:
   labels:
@@ -82,7 +67,7 @@ spec:
           name: tmp
           subPath: tmp
         - mountPath: /var/lib/rabbitmq
-          name: rabbitmq-data
+          name: data
           subPath: data
       securityContext:
         runAsNonRoot: true
@@ -98,10 +83,20 @@ spec:
       - name: rabbitmq-config
         configMap:
           name: rabbitmq
-      - name: rabbitmq-data
-        persistentVolumeClaim:
-          claimName: rabbitmq
       - name: tmp
         emptyDir:
           medium: Memory
-
+  volumeClaimTemplates:
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: data
+      labels:
+        app.kubernetes.io/name: rabbitmq
+        app.kubernetes.io/component: rabbitmq
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 1Gi