diff --git a/Docker/HomeAssistant/compose.yml b/Docker/HomeAssistant/compose.yml
new file mode 100644
index 0000000..611ac94
--- /dev/null
+++ b/Docker/HomeAssistant/compose.yml
@@ -0,0 +1,60 @@
+services:
+  zigbee2mqtt:
+    image: "koenkk/zigbee2mqtt:stable"
+    container_name: Zigbee2MQTT
+    privileged: true
+    group_add:
+      - uucp
+    networks:
+      - homelogic
+    environment:
+      - TZ=America/Santiago
+    ports:
+      - 3001:8080
+    volumes:
+      - ./MQTT:/app/data
+      - /run/udev:/run/udev:ro
+      - /etc/localtime:/etc/localtime:ro
+    #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
+    ports:
+      - 8123:8123
+    environment:
+      - TZ=America/Santiago
+      - PROXY_HOSTNAME=0.0.0.0/0
+      - HOME=/config
+  mosquitto:
+    image: "eclipse-mosquitto:stable"
+    container_name: Mosquitto
+    networks:
+      - homelogic
+    environment:
+      - GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7
+    volumes:
+      - ./Mosquitto:/mosquitto
+      - ./Mosquitto/data:/mosquitto/data
+      - ./Mosquitto/log:/mosquitto/log
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - 1883:1883
+    #  - 3001:9001
+    #network_mode: host
+    #privileged: true
+    command: 'mosquitto -c mosquitto/mosquitto.conf'
+    restart: unless-stopped
+
+networks:
+  homelogic:
+    name: homelogic
+    external: true
\ No newline at end of file
diff --git a/Docker/NextExplorer/compose.yml b/Docker/NextExplorer/compose.yml
index e69de29..40f6500 100644
--- a/Docker/NextExplorer/compose.yml
+++ b/Docker/NextExplorer/compose.yml
@@ -0,0 +1,24 @@
+services:
+  nextexplorer:
+    image: nxzai/explorer:latest
+    container_name: nextExplorer
+    restart: unless-stopped
+    ports:
+      - 3000:3000
+    environment:
+      - NODE_ENV=production
+      - SHOW_VOLUME_USAGE=false
+      - AUTH_MODE=oidc
+      - PUBLIC_URL=http://localhost:3000
+      - OIDC_ENABLED=false
+    volumes:
+      - ./config:/config
+      - ./cache:/cache
+      - ../:/mnt/Docker
+    networks:
+      - homelogic
+
+networks:
+  homelogic:
+    name: homelogic
+    external: true
\ No newline at end of file
diff --git a/setup_homelogic.sh b/setup_homelogic.sh
index 917fb21..3d166a1 100644
--- a/setup_homelogic.sh
+++ b/setup_homelogic.sh
@@ -1,15 +1,15 @@
+# Setup SSH server
 sudo systemctl enable sshd
-
 sudo ufw allow 22/tcp
 
+# Setup Docker
 sudo pacman -S docker docker-compose docker-buildx
-
 sudo systemctl enable --now docker.service
-
 sudo usermod -aG docker {$USER}
-
 newgrp docker
+docker create network homelogic
 
+# Setup ZSH
 cat >> ~/.zshrc << 'EOF'
 # Custom aliases
 alias la="ls -a"
@@ -25,6 +25,8 @@ alias size='sudo du -sxh .'
 alias ,,='..'
 alias restart='down && up'
 EOF
-# Reload zshrc to apply changes
 source ~/.zshrc
 
+# Setup Tailscale
+curl -fsSL https://tailscale.com/install.sh | sh
+sudo tailscale up