diff --git a/Docker/HomeAssistant/compose.yml b/Docker/HomeAssistant/compose.yml
index 611ac94..6638141 100644
--- a/Docker/HomeAssistant/compose.yml
+++ b/Docker/HomeAssistant/compose.yml
@@ -1,6 +1,6 @@
 services:
   zigbee2mqtt:
-    image: "koenkk/zigbee2mqtt:stable"
+    image: "koenkk/zigbee2mqtt:latest"
     container_name: Zigbee2MQTT
     privileged: true
     group_add:
diff --git a/setup_homelogic.sh b/setup_homelogic.sh
index a1f0478..2ffd2dd 100755
--- a/setup_homelogic.sh
+++ b/setup_homelogic.sh
@@ -17,7 +17,9 @@ sudo docker network create homelogic 2>/dev/null || true
 
 # Setup ZSH
 echo '### Setting up ZSH ###'
-chsh -s /usr/bin/zsh
+if [ "${SHELL##*/}" != "zsh" ]; then
+    chsh -s /usr/bin/zsh
+fi
 
 sed -i '/# --- HOMELOGIC ALIASES START ---/,/# --- HOMELOGIC ALIASES END ---/d' ~/.zshrc 2>/dev/null || true
 sed -i '/# Custom aliases/,/alias restart=/d' ~/.zshrc 2>/dev/null || true