diff --git a/deploy_custom_images.yml.tmpl b/deploy_custom_images.yml.tmpl
new file mode 100644
index 0000000000000000000000000000000000000000..77303c3ab4bd0237ba12726b7cc53cbcca0fa804
--- /dev/null
+++ b/deploy_custom_images.yml.tmpl
@@ -0,0 +1,9 @@
+${CUSTOM_IMAGE_TYPE}:
+  script:
+    - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" $CI_REGISTRY
+    - docker pull $UAT_REGISTRY/custom_images/${CUSTOM_IMAGE_TYPE}:main
+    - docker tag $UAT_REGISTRY/custom_images/${CUSTOM_IMAGE_TYPE}:main $CI_REGISTRY/root/maap-workspaces/custom_images/${CUSTOM_IMAGE_TYPE}:${TAG}
+    - docker push $CI_REGISTRY/root/maap-workspaces/custom_images/${CUSTOM_IMAGE_TYPE}:${TAG}
+
+  tags:
+    - shell
\ No newline at end of file
diff --git a/generate-deploy-ops-stages.sh b/generate-deploy-ops-stages.sh
index 3788d234b660cb008a320bb6753988d02c4b53ef..e56ff1e5e954d51c88733afdce9f2cddfb7c6d88 100644
--- a/generate-deploy-ops-stages.sh
+++ b/generate-deploy-ops-stages.sh
@@ -7,17 +7,29 @@ if [[ ! -z "${TAG}" ]]; then
   pushd maap-workspaces
   # List paths containing dockerfiles
   find base_images -name "Dockerfile" -type f > ${basedir}/images.txt
+  find custom_images -name "Dockerfile" -type f >> ${basedir}/images.txt
   popd
   cat ${basedir}/images.txt
   template="${basedir}/deploy.yml.tmpl"
   cat ${basedir}/images.txt | while read image
   do
-    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' envsubst >> deploy.yml
+    if [[ "$image" == base_images/*/* ]]; then
+      template="${basedir}/deploy.yml.tmpl"
+      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' envsubst >> deploy.yml
+    elif [[ "$image" == custom_images/*/* ]]; then
+      template="${basedir}/deploy_custom_images.yml.tmpl"
+      second_dir=$(echo "$image" | cut -d'/' -f2)
+      export CUSTOM_IMAGE_TYPE=${second_dir}
+      export TAG=${TAG}
+      export DIT_REGISTRY=${DIT_REGISTRY}
+      cat ${template} | CI_JOB_TOKEN='$CI_JOB_TOKEN' envsubst >> deploy.yml
+    fi
   done
+
 fi
 
 echo "Generate stages.yaml"