diff --git a/scripts/check_certificates.sh b/scripts/check_certificates.sh
index 300e5c3..1cf3db0 100755
--- a/scripts/check_certificates.sh
+++ b/scripts/check_certificates.sh
@@ -14,17 +14,9 @@
 	TIMEOUT=$TIMEOUT
 	RESTART=$RESTART
 
-# Setup docker registry url path
-
-if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
-	SETUP="/setup";
-else
-	SETUP="setup";
-	DOCKER_REGISTRY_URL="";
-fi
+SETUP_VERSION=${SETUP_VERSION:-latest};
 
 # Setting service files path
-
 if [ "$SERVICE_FILES" == "" ]; then
 	SERVICE_FILES=/etc/user/config/services
 fi
@@ -33,6 +25,7 @@ if [ "$SOURCE" == "" ]; then
 	SOURCE=/etc/user/config
 fi
 
+# Setup docker registry url path
 if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]] ; then
     SETUP="/setup";
 else
@@ -49,7 +42,7 @@ service_exec="docker run --rm \
 --mount src=USER_CONFIG,dst=/etc/user/config/user.json,volume-subpath=user.json,ro \
 -v /var/run/docker.sock:/var/run/docker.sock \
 --env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
-$DOCKER_REGISTRY_URL$SETUP"                                                              
+$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"                                                              
                                                                                          
 letsencrypt_certificates() {                                                             
                                                                                          
diff --git a/scripts/check_proxy_state.sh b/scripts/check_proxy_state.sh
index d933314..ccc7239 100755
--- a/scripts/check_proxy_state.sh
+++ b/scripts/check_proxy_state.sh
@@ -20,6 +20,7 @@ ROLE=$ROLE
 SERVICE_NAME=$SERVICE_NAME
 PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR
 
+SETUP_VERSION=${SETUP_VERSION:-latest};
 
 # Setup docker registry url path
 
@@ -77,7 +78,7 @@ service_exec="docker run --rm \
  -v /etc/user/config/services/tmp/:/services/tmp/:rw \
  -v /var/run/docker.sock:/var/run/docker.sock \
  --env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
- $DOCKER_REGISTRY_URL$SETUP"
+ $DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
 
 do_proxy_restart() {