diff --git a/manifests/api.pp b/manifests/api.pp
index b69448f7..1986bc08 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -81,7 +81,7 @@ class heat::api (
   package { 'heat-api':
     ensure => $package_ensure,
     name   => $::heat::params::api_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'heat-package'],
   }
 
   if $manage_service {
@@ -101,6 +101,7 @@ class heat::api (
     require    => [Package['heat-common'],
                   Package['heat-api']],
     subscribe  => $::heat::subscribe_sync_db,
+    tag        => 'heat-service',
   }
 
   heat_config {
diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp
index 36eebb04..9c9409fd 100644
--- a/manifests/api_cfn.pp
+++ b/manifests/api_cfn.pp
@@ -84,7 +84,7 @@ class heat::api_cfn (
   package { 'heat-api-cfn':
     ensure => $package_ensure,
     name   => $::heat::params::api_cfn_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'heat-package'],
   }
 
   if $manage_service {
@@ -104,6 +104,7 @@ class heat::api_cfn (
     hasstatus  => true,
     hasrestart => true,
     subscribe  => $::heat::subscribe_sync_db,
+    tag        => 'heat-service',
   }
 
   heat_config {
diff --git a/manifests/api_cloudwatch.pp b/manifests/api_cloudwatch.pp
index c4614070..b4889199 100644
--- a/manifests/api_cloudwatch.pp
+++ b/manifests/api_cloudwatch.pp
@@ -83,7 +83,7 @@ class heat::api_cloudwatch (
   package { 'heat-api-cloudwatch':
     ensure => $package_ensure,
     name   => $::heat::params::api_cloudwatch_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'heat-package'],
   }
 
   if $manage_service {
@@ -104,6 +104,7 @@ class heat::api_cloudwatch (
     hasstatus  => true,
     hasrestart => true,
     subscribe  => $::heat::subscribe_sync_db,
+    tag        => 'heat-service',
   }
 
   heat_config {
diff --git a/manifests/engine.pp b/manifests/engine.pp
index d702992f..b046aa8d 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -116,7 +116,7 @@ class heat::engine (
   package { 'heat-engine':
     ensure => $package_ensure,
     name   => $::heat::params::engine_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'heat-package'],
     notify => $::heat::subscribe_sync_db,
   }
 
@@ -145,6 +145,7 @@ class heat::engine (
                     Package['heat-common'],
                     Package['heat-engine']],
     subscribe  => $::heat::subscribe_sync_db,
+    tag        => 'heat-service',
   }
 
   heat_config {
diff --git a/manifests/init.pp b/manifests/init.pp
index 72a651c8..f15fc737 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -318,7 +318,7 @@ class heat(
   package { 'heat-common':
     ensure => $package_ensure,
     name   => $::heat::params::common_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'heat-package'],
   }
 
   Package['heat-common'] -> Heat_config<||>
diff --git a/spec/classes/heat_api_cfn_spec.rb b/spec/classes/heat_api_cfn_spec.rb
index 6af343a9..11e51b7d 100644
--- a/spec/classes/heat_api_cfn_spec.rb
+++ b/spec/classes/heat_api_cfn_spec.rb
@@ -74,7 +74,8 @@ describe 'heat::api_cfn' do
             :name       => platform_params[:api_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
-            :hasrestart => true
+            :hasrestart => true,
+            :tag        => 'heat-service',
           )
           is_expected.to contain_service('heat-api-cfn').that_subscribes_to('Exec[heat-dbsync]')
         end
@@ -95,7 +96,8 @@ describe 'heat::api_cfn' do
           :name       => platform_params[:api_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'heat-service',
         )
         is_expected.to contain_service('heat-api-cfn').that_subscribes_to('Exec[heat-dbsync]')
       end
diff --git a/spec/classes/heat_api_cloudwatch_spec.rb b/spec/classes/heat_api_cloudwatch_spec.rb
index 7077d87c..88236392 100644
--- a/spec/classes/heat_api_cloudwatch_spec.rb
+++ b/spec/classes/heat_api_cloudwatch_spec.rb
@@ -74,7 +74,8 @@ describe 'heat::api_cloudwatch' do
             :name       => platform_params[:api_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
-          :hasrestart => true
+            :hasrestart => true,
+            :tag        => 'heat-service',
           )
           is_expected.to contain_service('heat-api-cloudwatch').that_subscribes_to('Exec[heat-dbsync]')
         end
@@ -95,7 +96,8 @@ describe 'heat::api_cloudwatch' do
           :name       => platform_params[:api_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'heat-service',
         )
         is_expected.to contain_service('heat-api-cloudwatch').that_subscribes_to('Exec[heat-dbsync]')
       end
diff --git a/spec/classes/heat_api_spec.rb b/spec/classes/heat_api_spec.rb
index 91589ff1..18aff28f 100644
--- a/spec/classes/heat_api_spec.rb
+++ b/spec/classes/heat_api_spec.rb
@@ -76,7 +76,8 @@ describe 'heat::api' do
             :enable     => params[:enabled],
             :hasstatus  => true,
             :hasrestart => true,
-            :require    => ['Package[heat-common]', 'Package[heat-api]']
+            :require    => ['Package[heat-common]', 'Package[heat-api]'],
+            :tag        => 'heat-service',
           )
           is_expected.to contain_service('heat-api').that_subscribes_to('Exec[heat-dbsync]')
         end
@@ -99,6 +100,7 @@ describe 'heat::api' do
           :hasstatus  => true,
           :hasrestart => true,
           :require    => ['Package[heat-common]', 'Package[heat-api]'],
+          :tag        => 'heat-service',
         )
         is_expected.to contain_service('heat-api').that_subscribes_to('Exec[heat-dbsync]')
       end
diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb
index 7549d06a..b011720d 100644
--- a/spec/classes/heat_engine_spec.rb
+++ b/spec/classes/heat_engine_spec.rb
@@ -49,7 +49,7 @@ describe 'heat::engine' do
       it { is_expected.to contain_package('heat-engine').with(
         :ensure => 'present',
         :name   => os_params[:package_name],
-        :tag    => 'openstack',
+        :tag    => ['openstack', 'heat-package'],
         :notify => 'Exec[heat-dbsync]'
       ) }
 
@@ -62,7 +62,8 @@ describe 'heat::engine' do
         :require    => [ 'File[/etc/heat/heat.conf]',
                          'Package[heat-common]',
                          'Package[heat-engine]'],
-        :subscribe  => 'Exec[heat-dbsync]'
+        :subscribe  => 'Exec[heat-dbsync]',
+        :tag        => 'heat-service',
       ) }
 
       it { is_expected.to contain_heat_config('DEFAULT/auth_encryption_key').with_value( expected_params[:auth_encryption_key] ) }
@@ -102,7 +103,8 @@ describe 'heat::engine' do
         :require    => [ 'File[/etc/heat/heat.conf]',
                          'Package[heat-common]',
                          'Package[heat-engine]'],
-        :subscribe  => 'Exec[heat-dbsync]'
+        :subscribe  => 'Exec[heat-dbsync]',
+        :tag        => 'heat-service',
       ) }
     end
     context 'with $sync_db set to false in ::heat' do
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index c1edc290..81c39fba 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -126,7 +126,7 @@ describe 'heat' do
       is_expected.to contain_package('heat-common').with(
         :ensure => 'present',
         :name   => platform_params[:common_package_name],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'heat-package'],
       )
     end