diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 7b8fe23440..51be56448d 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -124,7 +124,7 @@ resource_registry:
   OS::TripleO::Services::Congress: OS::Heat::None
   OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
   OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml
-  OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry.yaml
+  OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry-disabled.yaml
   OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml
   OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml
   OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml
@@ -189,8 +189,8 @@ resource_registry:
   OS::TripleO::Services::Tacker: OS::Heat::None
   OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
   OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml
-  OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector.yaml
-  OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer.yaml
+  OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector-disabled.yaml
+  OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer-disabled.yaml
   OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml
   OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml
   OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
diff --git a/puppet/services/disabled/ceilometer-collector.yaml b/puppet/services/disabled/ceilometer-collector-disabled.yaml
similarity index 95%
rename from puppet/services/disabled/ceilometer-collector.yaml
rename to puppet/services/disabled/ceilometer-collector-disabled.yaml
index 64fd476de0..18092a8fbd 100644
--- a/puppet/services/disabled/ceilometer-collector.yaml
+++ b/puppet/services/disabled/ceilometer-collector-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
   role_data:
     description: Role data for the disabled Ceilometer Collector role.
     value:
-      service_name: ceilometer_collector
+      service_name: ceilometer_collector_disabled
       upgrade_tasks:
         - name: Stop and disable ceilometer_collector service on upgrade
           tags: step1
diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
similarity index 95%
rename from puppet/services/disabled/ceilometer-expirer.yaml
rename to puppet/services/disabled/ceilometer-expirer-disabled.yaml
index 182193ec92..e6d8ee6e47 100644
--- a/puppet/services/disabled/ceilometer-expirer.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
   role_data:
     description: Role data for the disabled Ceilometer Expirer role.
     value:
-      service_name: ceilometer_expirer
+      service_name: ceilometer_expirer_disabled
       upgrade_tasks:
         - name: Stop and disable ceilometer_expirer service on upgrade
           tags: step1
diff --git a/puppet/services/disabled/glance-registry.yaml b/puppet/services/disabled/glance-registry-disabled.yaml
similarity index 96%
rename from puppet/services/disabled/glance-registry.yaml
rename to puppet/services/disabled/glance-registry-disabled.yaml
index b2cd03eea6..85a5c5efbc 100644
--- a/puppet/services/disabled/glance-registry.yaml
+++ b/puppet/services/disabled/glance-registry-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
   role_data:
     description: Role data for the disabled Glance Registry role.
     value:
-      service_name: glance_registry
+      service_name: glance_registry_disabled
       upgrade_tasks:
         - name: Stop and disable glance_registry service on upgrade
           tags: step1