diff --git a/puppet/services/docker-registry.j2.yaml b/puppet/services/docker-registry.j2.yaml
index 5ee09fbf0b..83c6495b2c 100644
--- a/puppet/services/docker-registry.j2.yaml
+++ b/puppet/services/docker-registry.j2.yaml
@@ -60,10 +60,8 @@ outputs:
               - 8787
               - 13787
       step_config: ''
-      host_prep_tasks: []
-      deploy_steps_tasks:
+      host_prep_tasks:
         - name: Install, Configure and Run Docker Distribution
-          when: step|int == 1
           block:
           # NOTE(bogdando): w/a https://github.com/ansible/ansible/issues/42621
           - set_fact:
@@ -77,6 +75,10 @@ outputs:
           - include_role:
               name: container-registry
               tasks_from: docker-distribution
+      external_deploy_tasks:
+        - name: Container image prepare
+          when: step|int == 1
+          block:
           - name: Create temp file for prepare parameter
             tempfile:
               state: file
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index 1d2968661f..3acc11a288 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -80,10 +80,8 @@ outputs:
       service_name: docker
       config_settings: {}
       step_config: ''
-      host_prep_tasks: []
-      deploy_steps_tasks:
+      host_prep_tasks:
         - name: Install, Configure and Run Docker
-          when: step|int == 1
           block:
           # NOTE(bogdando): w/a https://github.com/ansible/ansible/issues/42621
           - set_fact: &docker_vars