diff --git a/generate-deploy-stages.sh b/generate-deploy-stages.sh
index 4c6b9a1f1a3183cc3dca7b201b56f617a67e2e9e..df907217c25bb16194366e438c7b7468e913177c 100644
--- a/generate-deploy-stages.sh
+++ b/generate-deploy-stages.sh
@@ -2,18 +2,23 @@
 
 set -e
 basedir=$( cd "$(dirname "$0")" ; pwd -P )
-cat $TRIGGER_PAYLOAD | python3 -c "import sys, json; print(json.loads(json.load(sys.stdin)['payload'])['ref'])" | grep "-uat"
+cat $TRIGGER_PAYLOAD 
+cat $TRIGGER_PAYLOAD | python3 -c "import sys, json; print(json.loads(json.load(sys.stdin)['payload'])['ref'])" | grep "uat"
 TAG=$(!!)
-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
-cat ${basedir}/images.txt
-template="${basedir}/deploy.yml.tmpl"
-cat ${basedir}/images.txt | while read image
-do
-  export BASE_IMAGE_TYPE=$(basename ${image})
-  export TAG=${TAG}
-  cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' CI_REGISTRY='$CI_REGISTRY' envsubst >> deploy.yml
-done
+touch deploy.yml
+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
+  cat ${basedir}/images.txt
+  template="${basedir}/deploy.yml.tmpl"
+  cat ${basedir}/images.txt | while read image
+  do
+    export BASE_IMAGE_TYPE=$(basename ${image})
+    export TAG=${TAG}
+    cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' CI_REGISTRY='$CI_REGISTRY' envsubst >> deploy.yml
+  done
+fi
+
 echo "Generate stages.yaml"
 cat deploy.yml || true