diff --git a/manifests/api.pp b/manifests/api.pp
index 9b8ff8cc..e924aba3 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -113,11 +113,10 @@ class heat::api (
       enable => false,
       tag    => ['heat-service'],
     }
+    Service <| title == 'httpd' |> { tag +> 'heat-service' }
 
     # we need to make sure heat-api/eventlet is stopped before trying to start apache
     Service['heat-api'] -> Service[$service_name]
-    # the apache service is untagged so add it to the service section manually
-    Anchor['heat::service::begin'] ~> Service[$service_name]
   } else {
     fail("Invalid service_name. Either heat-api/openstack-heat-api for \
 running as a standalone service, or httpd for being run by a httpd server")
diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp
index eb67b725..1ef2fe73 100644
--- a/manifests/api_cfn.pp
+++ b/manifests/api_cfn.pp
@@ -116,11 +116,10 @@ class heat::api_cfn (
       enable => false,
       tag    => ['heat-service'],
     }
+    Service <| title == 'httpd' |> { tag +> 'heat-service' }
 
     # we need to make sure heat-api-cfn/eventlet is stopped before trying to start apache
     Service['heat-api-cfn'] -> Service[$service_name]
-    # the apache service is untagged so add it to the service section manually
-    Anchor['heat::service::begin'] ~> Service[$service_name]
   } else {
     fail("Invalid service_name. Either heat-api-cfn/openstack-heat-api-cfn for \
 running as a standalone service, or httpd for being run by a httpd server")