diff --git a/scripts/check_certificates.sh b/scripts/check_certificates.sh
index 4ba200a..60c95dd 100755
--- a/scripts/check_certificates.sh
+++ b/scripts/check_certificates.sh
@@ -10,18 +10,20 @@
 
 # Setup docker registry url path
 
-if [[ ! -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
-	SETUP="'/setup'";
+if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
+	SETUP="/setup";
 else
 	SETUP="setup";
-	$DOCKER_REGISTRY_URL="";
+	DOCKER_REGISTRY_URL="";
 fi
 
 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 /scripts/service-exec"
+ -v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP "
 
 letsencrypt_certificates() {