diff --git a/generate-deploy-stages.sh b/generate-deploy-stages.sh
index 4d9a7c04c537ae9fe531ef2351e8eeda2492036f..63cae8387dee9d3bd8f519839a9584132d4745bc 100644
--- a/generate-deploy-stages.sh
+++ b/generate-deploy-stages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 basedir=$( cd "$(dirname "$0")" ; pwd -P )
 echo TRIGGER_PAYLOAD=$TRIGGER_PAYLOAD
 cat $TRIGGER_PAYLOAD
@@ -8,8 +8,9 @@ cat $TRIGGER_PAYLOAD | python3 -c "import sys, json; print(json.loads(json.load(
 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
-  git clone --single-branch --branch ${TAG} https://github.com/MAAP-Project/maap-workspaces.git
+  git clone https://github.com/MAAP-Project/maap-workspaces.git
   pushd maap-workspaces
+  git checkout ${TAG}
   find base_images -type d -depth 1 > ${basedir}/images.txt
   cat ${basedir}/images.txt
   template="${basedir}/deploy.yml.tmpl"