diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml
index 22ff1b6dc..f26659468 100644
--- a/config/general_config/featureset002.yml
+++ b/config/general_config/featureset002.yml
@@ -12,7 +12,7 @@ step_introspect: true
 to_build: true
 # Delete the overcloud after deployment
 step_delete_overcloud: true
-undercloud_check_idempotency: true
+undercloud_check_idempotency: false
 
 # This enables container deployements after Pike
 containerized_overcloud: >-
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index 5437ca878..19e263189 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -20,6 +20,7 @@ containerized_overcloud: >-
   {%- else -%}
   true
   {%- endif -%}
+undercloud_check_idempotency: true
 delete_docker_cache: true
 
 # Tell tripleo about our environment