diff --git a/Docker/HomeAssistant/compose.yml b/Docker/HomeAssistant/compose.yml
index 9e97bd1..a6e5398 100644
--- a/Docker/HomeAssistant/compose.yml
+++ b/Docker/HomeAssistant/compose.yml
@@ -1,5 +1,20 @@
 services:
+  homeassistant:
+    container_name: HomeAssistant
+    image: "ghcr.io/home-assistant/home-assistant:stable"
+    volumes:
+      - ./config:/config
+      - /etc/localtime:/etc/localtime:ro
+      - /run/dbus:/run/dbus:ro
+    restart: unless-stopped
+    privileged: true
+    network_mode: host
+    environment:
+      - TZ=America/Santiago
+      - PROXY_HOSTNAME=0.0.0.0/0
+      - HOME=/config
   zigbee2mqtt:
+    profiles: ["disabled"] # TODO: Enable only if using Zigbee stick
     image: "koenkk/zigbee2mqtt:latest"
     container_name: Zigbee2MQTT
     privileged: true
@@ -18,21 +33,8 @@ services:
     #devices:
     #  - /dev/ttyACM0:/dev/ttyACM0
     restart: unless-stopped
-  homeassistant:
-    container_name: HomeAssistant
-    image: "ghcr.io/home-assistant/home-assistant:stable"
-    volumes:
-      - ./config:/config
-      - /etc/localtime:/etc/localtime:ro
-      - /run/dbus:/run/dbus:ro
-    restart: unless-stopped
-    privileged: true
-    network_mode: host
-    environment:
-      - TZ=America/Santiago
-      - PROXY_HOSTNAME=0.0.0.0/0
-      - HOME=/config
   mosquitto:
+    profiles: ["disabled"] # TODO: Enable only if using Zigbee stick
     image: "eclipse-mosquitto:latest"
     container_name: Mosquitto
     networks: