diff --git a/deploy b/deploy
index 14b03892820af72363784b4ac23aa180eeef7f40..80dc37c403adc74d9d273d789b8dce99cf72e4b0 100755
--- a/deploy
+++ b/deploy
@@ -5,7 +5,7 @@ deploy() {
     echo "Deploying to $1" >&2
     export DOCKER_HOST="ssh://$1"
     export RUNNER_NAME="$1"
-    until docker-compose up --detach --remove-orphans 2>/dev/null; do true; done
+    until docker-compose up --detach --remove-orphans ; do true; done
     # shellcheck disable=SC2034
     for i in $(seq 12)
     do
@@ -25,8 +25,10 @@ then
     exit 1
 fi
 
+export REGISTER_RUN_UNTAGGED="true"
+export BUILDS='/builds'
+deploy "ns4.shore.co.il"
 export REGISTER_RUN_UNTAGGED="false"
+unset BUILDS
 deploy "host01.shore.co.il"
 deploy "kodi.shore.co.il"
-export REGISTER_RUN_UNTAGGED="true"
-deploy "ns4.shore.co.il"
diff --git a/docker-compose.yml b/docker-compose.yml
index d5c8ca519ee24f65b2d42040e1c44595f6f287d6..7a2ea4ef44067c4f5337f403792039229337746a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     image: adarnimrod/gitlab-runner
     restart: always
     volumes:
-      - builds:/builds
+      - "${BUILDS:-builds}:/builds"
       - config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
   crond: