diff --git a/scripts/check_proxy_state.sh b/scripts/check_proxy_state.sh
index 156aee3..f3b2d04 100755
--- a/scripts/check_proxy_state.sh
+++ b/scripts/check_proxy_state.sh
@@ -15,15 +15,20 @@ PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
 
 # Setup docker registry url path
 
-if [[ $REGISTRY_URL != "" ]] || [[ $REGISTRY_URL != "null" ]] ; then
-        SETUP="/setup";
+if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
+	SETUP="/setup";
 else
-
-        echo "Docker registry URL not defined in configuration";
-	exit;
+	SETUP="setup";
+	DOCKER_REGISTRY_URL="";
 fi
 
-service_exec="docker run --rm -v /etc/user/config/services/:/services/:ro -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker:ro $REGISTRY_URL$SETUP /scripts/service-exec"
+service_exec="docker run --rm \
+ -w /services/ \
+ -v /etc/user/config/user.json:/etc/user/config/user.json:ro \
+ -v /etc/user/config/services/:/services/:ro \
+ -v /etc/user/config/services/tmp/:/services/tmp/:rw \
+ -v /var/run/docker.sock:/var/run/docker.sock \
+ -v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP "
 
 do_proxy_restart() {