diff --git a/rabbitmq/deployment.yaml b/rabbitmq/deployment.yaml
deleted file mode 100644
index c0d178d..0000000
--- a/rabbitmq/deployment.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: rabbitmq
-  namespace: app-notifications
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: rabbitmq
-  template:
-    metadata:
-      labels:
-        app: rabbitmq
-    spec:
-      containers:
-      - name: rabbitmq
-        image: rabbitmq:3.11-management
-        ports:
-        - containerPort: 5672
-        - containerPort: 15672
-        volumeMounts:
-        - name: rabbitmq-data
-          mountPath: /var/lib/rabbitmq
-      volumes:
-      - name: rabbitmq-data
-        persistentVolumeClaim:
-          claimName: rabbitmq-pvc
diff --git a/rabbitmq/pvc.yaml b/rabbitmq/pvc.yaml
deleted file mode 100644
index f4585e3..0000000
--- a/rabbitmq/pvc.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: rabbitmq-pvc
-  namespace: app-notifications
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
diff --git a/rabbitmq/service.yaml b/rabbitmq/service.yaml
index 85ab0cf..22dc275 100644
--- a/rabbitmq/service.yaml
+++ b/rabbitmq/service.yaml
@@ -4,6 +4,8 @@ metadata:
   name: rabbitmq
   namespace: app-notifications
 spec:
+  selector:
+    app: rabbitmq
   ports:
     - port: 5672
       targetPort: 5672
@@ -13,6 +15,4 @@ spec:
       targetPort: 15672
       protocol: TCP
       name: management
-  selector:
-    app: rabbitmq
-  type: ClusterIP
+  clusterIP: None
diff --git a/rabbitmq/statefulset.yaml b/rabbitmq/statefulset.yaml
new file mode 100644
index 0000000..b65e22c
--- /dev/null
+++ b/rabbitmq/statefulset.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: rabbitmq
+  namespace: app-notifications
+spec:
+  serviceName: rabbitmq
+  replicas: 1
+  selector:
+    matchLabels:
+      app: rabbitmq
+  template:
+    metadata:
+      labels:
+        app: rabbitmq
+    spec:
+      containers:
+        - name: rabbitmq
+          image: rabbitmq:3.11-management
+          ports:
+            - containerPort: 5672
+            - containerPort: 15672
+          volumeMounts:
+            - name: rabbitmq-data
+              mountPath: /var/lib/rabbitmq
+  volumeClaimTemplates:
+    - metadata:
+        name: rabbitmq-data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 5Gi