diff --git a/generate-deploy-stages.sh b/generate-deploy-stages.sh
index 50c143263b494753b6c6fe8c6e2fb01349f567a7..b2b5f2d172dbe27f3bbcb79f8c872f049d218c2a 100644
--- a/generate-deploy-stages.sh
+++ b/generate-deploy-stages.sh
@@ -3,11 +3,11 @@
 set -e
 basedir=$( cd "$(dirname "$0")" ; pwd -P )
 echo TRIGGER_PAYLOAD=$TRIGGER_PAYLOAD
-cat $TRIGGER_PAYLOAD 
+cat $TRIGGER_PAYLOAD
 cat $TRIGGER_PAYLOAD | python3 -c "import sys, json; print(json.loads(json.load(sys.stdin)['payload'])['ref'])" | grep "uat"
 TAG=$(cat ${TRIGGER_PAYLOAD} | python3 -c "import sys, json; print(json.loads(json.load(sys.stdin)['payload'])['ref'])" | grep "uat")
 touch deploy.yml
-if [ -z "${TAG}" ]; then
+if [ ! -z "${TAG}" ]; then
   git clone --single-branch --branch ${TAG} https://github.com/MAAP-Project/maap-workspaces.git
   pushd maap-workspaces
   find base_images -type d -depth 1 > ${basedir}/images.txt
@@ -17,6 +17,7 @@ if [ -z "${TAG}" ]; then
   do
     export BASE_IMAGE_TYPE=$(basename ${image})
     export TAG=${TAG}
+    export DIT_REGISTRY=${DIT_REGISTRY}
     cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' CI_REGISTRY='$CI_REGISTRY' envsubst >> deploy.yml
   done
 fi