diff --git a/de/heat-templates/scripts/functions.sh b/de/heat-templates/scripts/functions.sh
index 5ffa909..82317a4 100644
--- a/de/heat-templates/scripts/functions.sh
+++ b/de/heat-templates/scripts/functions.sh
@@ -325,6 +325,7 @@
     function pull_image_retry {
         if [[ $KUBERNETES_CONTAINER_RUNTIME == "crio" ]]; then
             nerdctl --address  unix:///run/containerd/containerd.sock -n k8s.io pull $image
+            nerdctl --address  unix:///run/containerd/containerd.sock -n k8s.io image inspect $image
         fi
         docker pull ${image}
         docker image inspect ${image}
@@ -342,7 +343,7 @@
         function _pull_and_tag {
             pull_image "${image_prefix}/${image##*/}"
             if [[ $KUBERNETES_CONTAINER_RUNTIME == "crio" ]]; then
-                nerdctl --address  unix:///run/containerd/containerd.sock -n k8s.io  tag ${image_prefix}/${image##*/} mirantis/${image##*/} || (docker image ls && /bin/false)
+                nerdctl --address unix:///run/containerd/containerd.sock -n k8s.io  tag ${image_prefix}/${image##*/} mirantis/${image##*/}
             fi
             docker tag ${image_prefix}/${image##*/} mirantis/${image##*/}
         }