diff --git a/tripleo_ansible/playbooks/cli-create-deployment-plan.yaml b/tripleo_ansible/playbooks/cli-create-deployment-plan.yaml
index f0b006143..ee7e107d7 100644
--- a/tripleo_ansible/playbooks/cli-create-deployment-plan.yaml
+++ b/tripleo_ansible/playbooks/cli-create-deployment-plan.yaml
@@ -24,6 +24,7 @@
     container: overcloud
     source_url: null
     generate_passwords: true
+    disable_image_params_prepare: false
     plan_environment: plan-environment.yaml
     default_templates_dir: '/usr/share/openstack-tripleo-heat-templates/'
     use_default_templates: false
@@ -106,6 +107,7 @@
       tripleo_image_params_prepare:
         container: "{{ container }}"
         with_roledata: false
+      when: not (disable_image_params_prepare | bool)
 
     - name: Add root stack name
       tripleo_plan_parameters_update:
diff --git a/tripleo_ansible/playbooks/cli-update-deployment-plan.yaml b/tripleo_ansible/playbooks/cli-update-deployment-plan.yaml
index c894de17f..0b72a418d 100644
--- a/tripleo_ansible/playbooks/cli-update-deployment-plan.yaml
+++ b/tripleo_ansible/playbooks/cli-update-deployment-plan.yaml
@@ -24,6 +24,7 @@
     container: overcloud
     generate_passwords: true
     reset_passwords: false
+    disable_image_params_prepare: false
     hide_sensitive_logs: true
 
   tasks:
@@ -39,6 +40,7 @@
       tripleo_image_params_prepare:
         container: "{{ container }}"
         with_roledata: false
+      when: not (disable_image_params_prepare | bool)
 
     - name: Get backup tempurl for GET
       tripleo_swift_tempurl: