diff --git a/.idea/misc.xml b/.idea/misc.xml
index d7c52716..28a804d8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,9 +3,4 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="SwUserDefinedSpecifications">
-    <option name="specTypeByUrl">
-      <map />
-    </option>
-  </component>
 </project>
\ No newline at end of file
diff --git a/apps/MosquitoMQTTBroker.yaml b/apps/MosquitoMQTTBroker.yaml
new file mode 100644
index 00000000..6686105a
--- /dev/null
+++ b/apps/MosquitoMQTTBroker.yaml
@@ -0,0 +1,34 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: mosquitto
+  namespace: default
+spec:
+  chart:
+    spec:
+      chart: mosquitto
+      version: 4.3.2
+      sourceRef:
+        kind: HelmRepository
+        name: k8s-at-home
+        namespace: flux-system
+  dependsOn:
+    - name: yasr-volume
+  interval: 1h0m0s
+  values:
+    # TODO: why does it have to be NodePort?
+    service:
+      main:
+        type: NodePort
+        ports:
+          mqtt:
+            enabled: true
+            port: 1883
+            nodePort: 1883
+    persistence:
+      configinc:
+        enabled: true
+        type: pvc
+        existingClaim: yasr-volume
+        subPath: configs/mosquitto
diff --git a/apps/Zigbee2mqtt.yaml b/apps/Zigbee2mqtt.yaml
index 7f9fa994..be6b92aa 100644
--- a/apps/Zigbee2mqtt.yaml
+++ b/apps/Zigbee2mqtt.yaml
@@ -23,7 +23,7 @@ spec:
     config:
       homeassistant: true
       mqtt:
-        server: "mqtt://mqtt-broker-mosca"
+        server: "mqtt://10.1.1.2"
       serial:
         port: /dev/ttyUSB0
     image:
diff --git a/clusters/gandazgul/apps/kustomization.yaml b/clusters/gandazgul/apps/kustomization.yaml
index ccbc56ed..3d04464c 100644
--- a/clusters/gandazgul/apps/kustomization.yaml
+++ b/clusters/gandazgul/apps/kustomization.yaml
@@ -8,7 +8,8 @@ resources:
 - ../../../apps/Resilio.yaml
 - ../../../apps/Bitwarden.yaml
 - ../../../apps/HomeAssistant.yaml
-- ../../../apps/MQTTBroker.yaml
+#- ../../../apps/MQTTBroker.yaml
+- ../../../apps/MosquitoMQTTBroker.yaml
 - ../../../apps/transmission/gandazgul/
 - ../../../apps/Radarr.yaml
 - ../../../apps/Sonarr.yaml
diff --git a/clusters/rafag/apps/kustomization.yaml b/clusters/rafag/apps/kustomization.yaml
index 4390e189..22a3a2d2 100644
--- a/clusters/rafag/apps/kustomization.yaml
+++ b/clusters/rafag/apps/kustomization.yaml
@@ -8,13 +8,14 @@ resources:
 - ../../../apps/Resilio.yaml
 - ../../../apps/Bitwarden.yaml
 - ../../../apps/HomeAssistant.yaml
-- ../../../apps/MQTTBroker.yaml
-- ../../../apps/transmission/rafag/
-- ../../../apps/Radarr.yaml
-- ../../../apps/Sonarr.yaml
-- ../../../apps/Prowlarr.yaml
+#- ../../../apps/MQTTBroker.yaml
+#- ../../../apps/transmission/rafag/
+#- ../../../apps/Radarr.yaml
+#- ../../../apps/Sonarr.yaml
+#- ../../../apps/Prowlarr.yaml
 - ../../../apps/Photoprism.yaml
 - ../../../apps/Zigbee2mqtt.yaml
 - ../../../apps/Paperless.yaml
 - ../../../apps/SFTPGo.yaml
+- ../../../apps/MosquitoMQTTBroker.yaml
 #- ../../../apps/Minecraft.yaml