diff --git a/setup_homelogic.sh b/setup_homelogic.sh
index 3d166a1..817887b 100644
--- a/setup_homelogic.sh
+++ b/setup_homelogic.sh
@@ -3,30 +3,34 @@ sudo systemctl enable sshd
 sudo ufw allow 22/tcp
 
 # Setup Docker
-sudo pacman -S docker docker-compose docker-buildx
+sudo pacman -Sy docker docker-compose docker-buildx
 sudo systemctl enable --now docker.service
-sudo usermod -aG docker {$USER}
+if ! getent group docker > /dev/null 2>&1; then
+    sudo groupadd docker
+fi
+if ! id -nG "$USER" | grep -qw "docker"; then
+    sudo usermod -aG docker "$USER"
+fi
 newgrp docker
 docker create network homelogic
 
 # Setup ZSH
-cat >> ~/.zshrc << 'EOF'
-# Custom aliases
-alias la="ls -a"
-alias lah="ls -lah"
-alias treesize='sudo du -sh \* | sort -rh'
-alias up='docker compose up -d'
-alias down='docker compose down'
-alias pull='docker compose pull && up'
-alias mkdir='createDir() { mkdir $1 && cd "$\_" };createDir'
-alias token='openssl rand -hex 32'
-alias shortToken='openssl rand -hex 16'
-alias size='sudo du -sxh .'
-alias ,,='..'
-alias restart='down && up'
-EOF
-source ~/.zshrc
+echo '# Custom aliases' >> ~/.zshrc
+echo 'alias la="ls -a"' >> ~/.zshrc
+echo 'alias lah="ls -lah"' >> ~/.zshrc
+echo "alias treesize='sudo du -sh \\* | sort -rh'" >> ~/.zshrc
+echo "alias up='docker compose up -d'" >> ~/.zshrc
+echo "alias down='docker compose down'" >> ~/.zshrc
+echo "alias pull='docker compose pull && up'" >> ~/.zshrc
+echo "alias mkdir='createDir() { mkdir \\$1 && cd \"\\$\\_\" };createDir'" >> ~/.zshrc
+echo "alias token='openssl rand -hex 32'" >> ~/.zshrc
+echo "alias shortToken='openssl rand -hex 16'" >> ~/.zshrc
+echo "alias size='sudo du -sxh .'" >> ~/.zshrc
+echo "alias ,,='..'" >> ~/.zshrc
+echo "alias restart='down && up'" >> ~/.zshrc
 
 # Setup Tailscale
-curl -fsSL https://tailscale.com/install.sh | sh
-sudo tailscale up
+if ! command -v tailscale > /dev/null 2>&1; then
+    curl -fsSL https://tailscale.com/install.sh | sh
+    sudo tailscale up
+fi