diff --git a/generate-deploy-stages.sh b/generate-deploy-stages.sh
index 39cc05ee7f70043313fb773d81d9267cdd92445d..2cc1b8b9c0a8ed5c215eb68821e1cd84dddb7304 100644
--- a/generate-deploy-stages.sh
+++ b/generate-deploy-stages.sh
@@ -8,21 +8,22 @@ 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 https://github.com/MAAP-Project/maap-workspaces.git
+  git clone --single-branch --branch ${TAG} https://github.com/MAAP-Project/maap-workspaces.git
   pushd maap-workspaces
-  git checkout ${TAG}
-  ls -l 
-  find "base_images" -depth 1 -type d > ${basedir}/images.txt
+  ls -d base_images/*/* > ${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}
-    export DIT_REGISTRY=${DIT_REGISTRY}
-    cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' CI_REGISTRY='$CI_REGISTRY' envsubst >> deploy.yml
+    if [[ "$image" == base_images/*/* ]]; then
+      second_dir=$(echo "$image" | cut -d'/' -f2)
+      export BASE_IMAGE_TYPE=${second_dir}
+      export TAG=${TAG}
+      export DIT_REGISTRY=${DIT_REGISTRY}
+      cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' CI_REGISTRY='$CI_REGISTRY' envsubst >> deploy.yml
+    fi
   done
 fi
 
-echo "Generate deploy.yaml"
+echo "Generate stages.yaml"
 cat deploy.yml || true