diff --git a/deploy b/deploy
index 4c175e162f9c3c302980698726231a9dccde399d..58e5f730a0180f1d1e7457f90a818fa19f2f4678 100755
--- a/deploy
+++ b/deploy
@@ -31,19 +31,25 @@ then
     exit 1
 fi
 
-case "${1:-all}" in
-    ns4) export REGISTER_RUN_UNTAGGED="true"
-        export BUILDS='/builds'
-        _deploy ns4.shore.co.il
-        ;;
-    kodi) export REGISTER_RUN_UNTAGGED="false"
-        unset BUILDS
-        _deploy kodi.shore.co.il
-        ;;
-    host01) export REGISTER_RUN_UNTAGGED="false"
-        unset BUILDS
-        _deploy host01.shore.co.il
-        ;;
-    all) "$0" ns4; "$0" host01; "$0" kodi ;;
-    *) echo 'Unknown host.' >&2; exit 1;;
-esac
+
+[ "$#" -eq '0' ] && "$0" ns4 host01 kodi
+
+for i in "$@"
+do
+    case "$i" in
+        ns4) export REGISTER_RUN_UNTAGGED="true"
+            export BUILDS='/builds'
+            _deploy ns4.shore.co.il
+            ;;
+        kodi) export REGISTER_RUN_UNTAGGED="false"
+            unset BUILDS
+            _deploy kodi.shore.co.il
+            ;;
+        host01) export REGISTER_RUN_UNTAGGED="false"
+            unset BUILDS
+            _deploy host01.shore.co.il
+            ;;
+        all) "$0" ns4 host01 kodi ;;
+        *) echo 'Unknown host.' >&2; exit 1;;
+    esac
+done