diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 95a3ca4..71ce59e 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -331,11 +331,10 @@
     pull_image "${DOCKER_UCP_IMAGE}"
 
     local image_prefix=${DOCKER_UCP_IMAGE%/*}
-    local image_name=${DOCKER_UCP_IMAGE##*/}
-    if [[ "$image_name" =~ .*3.3.* || "$image_name" =~ .*3.5.* ]]; then
+    if [[ "$image_prefix" =~ .*\.mirantis\.net* ]]; then
         for image in $(docker container run --rm --name ucp -v /var/run/docker.sock:/var/run/docker.sock ${DOCKER_UCP_IMAGE} images --list); do
             pull_image "${image_prefix}/${image##*/}"
-            docker tag ${image_prefix}/${image##*/} ${image}
+            docker tag ${image_prefix}/${image##*/} mirantis/${image##*/}
         done
     fi
 }