diff --git a/common/hiera-steps-tasks.yaml b/common/hiera-steps-tasks.yaml
index bdb950d06a..af9b093bfc 100644
--- a/common/hiera-steps-tasks.yaml
+++ b/common/hiera-steps-tasks.yaml
@@ -28,3 +28,7 @@
       - service_configs
       - extraconfig
       - role_extraconfig
+- name: Ensure ansible_managed hieradata file exists
+  include_role:
+    name: tripleo-hieradata
+    tasks_from: ansible_hieradata.yml
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index df227500c5..fc59dbd361 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -593,6 +593,7 @@ resources:
           - '"%{::uuid}"'
           - fqdn
           - docker_puppet # Optionally provided by container-puppet.py
+          - ansible_managed
           - heat_config_%{::deploy_config_name}
           - config_step
           - role_extraconfig