diff --git a/.gitea/workflows/ deploy-to-homesrv.yml b/.gitea/workflows/ deploy-to-homesrv.yml
index 58d7e32..d287d4f 100644
--- a/.gitea/workflows/ deploy-to-homesrv.yml	
+++ b/.gitea/workflows/ deploy-to-homesrv.yml	
@@ -1,13 +1,13 @@
-on: 
-  push:
-  schedule:
-    - cron: '30 7 * * SUN' # Every Sunday at deploy
-jobs:
-  deploy-to-homesrv01:
-    runs-on: "myLimbo-casa-gitea-act-runner"
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
+# on: 
+#   push:
+#   schedule:
+#     - cron: '30 7 * * SUN' # Every Sunday at deploy
+# jobs:
+#   deploy-to-homesrv01:
+#     runs-on: "myLimbo-casa-gitea-act-runner"
+#     steps:
+#     - name: Checkout code
+#       uses: actions/checkout@v2
     
-    - name: docker compose up
-      run: docker compose up -d --pull always
\ No newline at end of file
+#     - name: docker compose up
+#       run: docker compose up -d --pull always
\ No newline at end of file
diff --git a/README.md b/README.md
index fc988ee..b663427 100644
--- a/README.md
+++ b/README.md
@@ -2,5 +2,4 @@
 
 ## Hosting
 
-Hosted on [homesrv01.dev.lan](/marcio.fernandes/homesrv01.dev.lan).
-
+Hosted on [casa.dev.lan](/marcio.fernandes/homesrv01.dev.lan).
\ No newline at end of file
diff --git a/deploy/mosquitto-data-pvc.yaml b/deploy/mosquitto-data-pvc.yaml
new file mode 100644
index 0000000..70b437b
--- /dev/null
+++ b/deploy/mosquitto-data-pvc.yaml
@@ -0,0 +1,13 @@
+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-deployment.yaml
new file mode 100644
index 0000000..896399f
--- /dev/null
+++ b/deploy/mosquitto-deployment.yaml
@@ -0,0 +1,60 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+    name: mosquitto
+    namespace: mqtt
+    labels:
+        app: mosquitto
+spec:
+    replicas: 1
+    selector:
+        matchLabels:
+            app: mosquitto
+    template:
+        metadata:
+          labels:
+              app: mosquitto
+        spec:
+          hostNetwork: true
+          containers:
+            - name: mosquitto
+              image: eclipse-mosquitto:latest
+              command: ["/usr/sbin/mosquitto"]
+              args: ["-c", "/etc/mosquitto/mosquitto.conf"]
+
+              ports:
+                - containerPort: 8883 # Default MQTT port for encrypted communication using TLS/SSL
+                  #hostPort: 8883 
+                  protocol: TCP
+                - containerPort: 1883 # Default MQTT port for unencrypted communication
+                  protocol: TCP
+                  #hostPort: 1883
+
+              volumeMounts:
+                - name: mosquitto-data
+                  mountPath: /mosquitto-data
+                  
+                - mountPath: /etc/mosquitto/mosquitto.conf
+                  name: mosquitto-secret
+                  subPath: config
+
+              resources:
+                requests:
+                  memory: "50Mi"
+                  cpu: "100m"
+                limits:
+                  memory: "100Mi"
+                  cpu: "200m"
+          volumes:
+
+              - name: mosquitto-data
+                persistentVolumeClaim:
+                  claimName : mosquitto-data
+                
+                
+              - name: mosquitto-secret
+                secret:
+                  secretName: "mosquitto"
+
+
+               
\ No newline at end of file
diff --git a/deploy/mosquitto-secret.yaml b/deploy/mosquitto-secret.yaml
new file mode 100644
index 0000000..497fba1
--- /dev/null
+++ b/deploy/mosquitto-secret.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..e0c9b1f
--- /dev/null
+++ b/deploy/mqtt-namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mqtt
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index f05bac2..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-services:
-  mosquitto:
-    image: eclipse-mosquitto:latest
-    ports:
-      - '1883:1883'
-      - '8883:8883'
-    environment:
-      - TZ= Europe/Lisbon
-    volumes:
-      - data:/mosquitto/data
-    configs:
-      - mosquitto_conf
-    command: /usr/sbin/mosquitto -c /mosquitto_conf
-    restart: unless-stopped
-volumes:
-  data:
-configs:
-  mosquitto_conf:
-    content: |
-      listener 1883
-      allow_anonymous true
-
-
-
-
-