diff --git a/deploy/mosquitto-data-pvc.yaml b/deploy/mosquitto-data-pvc.yaml
deleted file mode 100644
index 70b437b..0000000
--- a/deploy/mosquitto-data-pvc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mosquitto-data  
-  namespace: mqtt 
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: local-path 
-      
\ No newline at end of file
diff --git a/deploy/mosquitto-deployment.yaml b/deploy/mosquitto-deploy.yaml
similarity index 77%
rename from deploy/mosquitto-deployment.yaml
rename to deploy/mosquitto-deploy.yaml
index 896399f..54d20e2 100644
--- a/deploy/mosquitto-deployment.yaml
+++ b/deploy/mosquitto-deploy.yaml
@@ -1,5 +1,40 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mqtt
+---
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mosquitto-data  
+  namespace: mqtt 
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: local-path 
+
+---
+
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mosquitto
+  namespace: mqtt  
+type: Opaque
+stringData:
+  config: |
+      listener 1883
+      allow_anonymous true
+
+---
+
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
     name: mosquitto
     namespace: mqtt
diff --git a/deploy/mosquitto-secret.yaml b/deploy/mosquitto-secret.yaml
deleted file mode 100644
index 497fba1..0000000
--- a/deploy/mosquitto-secret.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mosquitto
-  namespace: mqtt  
-type: Opaque
-stringData:
-  config: |
-      listener 1883
-      allow_anonymous true
\ No newline at end of file
diff --git a/deploy/mqtt-namespace.yaml b/deploy/mqtt-namespace.yaml
deleted file mode 100644
index e0c9b1f..0000000
--- a/deploy/mqtt-namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mqtt
\ No newline at end of file