diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 71ff650e11..99024ae238 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -703,7 +703,7 @@ resources:
             - {get_param: {{role.name}}ExtraConfig}
         extraconfig: {get_param: ExtraConfig}
         hieradata_files:
-          - '"%{::uuid}"'
+          - '%{::uuid}'
           - fqdn
           - docker_puppet # Optionally provided by container-puppet.sh
           - ansible_managed
@@ -719,7 +719,7 @@ resources:
           - all_nodes # provided by tripleo_hieradata
           - vip_data # provided by tripleo_hieradata
           - net_ip_map
-          - '"%{::osfamily}"'
+          - '%{::osfamily}'
           # The following are required for compatibility with the Controller role
           # where some vendor integrations added hieradata via ExtraConfigPre
           - neutron_bigswitch_data # Optionally provided by Controller/ComputeExtraConfigPre