diff --git a/environments/public-tls-undercloud.yaml b/environments/public-tls-undercloud.yaml
index 9542c53f1f..cb8c174734 100644
--- a/environments/public-tls-undercloud.yaml
+++ b/environments/public-tls-undercloud.yaml
@@ -3,5 +3,4 @@ parameter_defaults:
   PublicSSLCertificateAutogenerated: true
 
 resource_registry:
-  OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml
   OS::TripleO::Services::HAProxyPublicTLS: ../puppet/services/haproxy-public-tls-certmonger.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 7d658033c4..54dfc41dd0 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -312,7 +312,7 @@ resource_registry:
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Docker: puppet/services/docker.yaml
   OS::TripleO::Services::DockerRegistry: OS::Heat::None
-  OS::TripleO::Services::CertmongerUser: OS::Heat::None
+  OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml
   OS::TripleO::Services::Clustercheck: OS::Heat::None
   OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
   OS::TripleO::Services::VRTSHyperScale: OS::Heat::None