diff --git a/bin/omarchy-install-firewall b/bin/omarchy-install-firewall
index 4c3fca49..d1cca954 100755
--- a/bin/omarchy-install-firewall
+++ b/bin/omarchy-install-firewall
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 if ! command -v ufw &>/dev/null; then
-  yay -S --noconfirm --needed ufw ufw-docker
+  yay -S --noconfirm ufw
+fi
+
+if ! command -v ufw-docker &>/dev/null; then
+  yay -S --noconfirm ufw
 fi
 
 # Allow nothing in, everything out
diff --git a/install/development/firewall.sh b/install/development/firewall.sh
index 39e9e0ad..c04c876b 100644
--- a/install/development/firewall.sh
+++ b/install/development/firewall.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-if -z "${OMARCHY_CHROOT_INSTALL:-}"; then
+if [[ -z "${OMARCHY_CHROOT_INSTALL:-}" ]]; then
   omarchy-install-firewall
 fi