diff --git a/manifests/api.pp b/manifests/api.pp
index 26dc0b38..4e8e335b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -243,7 +243,7 @@ class glance::api(
     ensure_packages([$glance::params::api_package_name],
       {
         ensure => $package_ensure,
-        tag    => ['openstack'],
+        tag    => ['openstack', 'glance-package'],
       }
     )
   }
@@ -498,6 +498,7 @@ class glance::api(
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
+    tag        => 'glance-service',
   }
 
   if $validate {
diff --git a/manifests/init.pp b/manifests/init.pp
index 3b104225..ef61db93 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,7 +26,7 @@ class glance(
     package { $glance::params::api_package_name :
       ensure => $package_ensure,
       name   => $::glance::params::package_name,
-      tag    => ['openstack'],
+      tag    => ['openstack', 'glance-package'],
     }
   }
 }
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 00fd78ac..27531014 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -166,7 +166,7 @@ class glance::registry(
     ensure_packages( [$glance::params::registry_package_name],
       {
         ensure => $package_ensure,
-        tag    => ['openstack'],
+        tag    => ['openstack', 'glance-package'],
       }
     )
   }
@@ -386,7 +386,8 @@ class glance::registry(
     hasstatus  => true,
     hasrestart => true,
     subscribe  => File['/etc/glance/glance-registry.conf'],
-    require    => Class['glance']
+    require    => Class['glance'],
+    tag        => 'glance-service',
   }
 
 }
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index bdac287a..5ba40019 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -87,7 +87,8 @@ describe 'glance::api' do
         'ensure'     => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running': 'stopped',
         'enable'     => param_hash[:enabled],
         'hasstatus'  => true,
-        'hasrestart' => true
+        'hasrestart' => true,
+        'tag'        => 'glance-service',
       ) }
 
       it { is_expected.to_not contain_exec('validate_nova_api') }
@@ -183,7 +184,8 @@ describe 'glance::api' do
         'ensure'     => nil,
         'enable'     => false,
         'hasstatus'  => true,
-        'hasrestart' => true
+        'hasrestart' => true,
+        'tag'        => 'glance-service',
       ) }
   end
 
@@ -441,7 +443,7 @@ describe 'glance::api' do
         let(:params) { default_params.merge({ :package_ensure => package_ensure }) }
         it { is_expected.to contain_package('glance-api').with(
             :ensure => package_ensure,
-            :tag    => ['openstack']
+            :tag    => ['openstack', 'glance-package']
         )}
       end
     end
@@ -454,7 +456,7 @@ describe 'glance::api' do
     let(:params) { default_params }
 
     it { is_expected.to contain_package('openstack-glance').with(
-        :tag => ['openstack'],
+        :tag => ['openstack', 'glance-package'],
     )}
   end
 
diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb
index 9f956dfc..67ebf5f0 100644
--- a/spec/classes/glance_registry_spec.rb
+++ b/spec/classes/glance_registry_spec.rb
@@ -71,7 +71,8 @@ describe 'glance::registry' do
           'hasstatus'  => true,
           'hasrestart' => true,
           'subscribe'  => 'File[/etc/glance/glance-registry.conf]',
-          'require'    => 'Class[Glance]'
+          'require'    => 'Class[Glance]',
+          'tag'        => 'glance-service',
       )}
 
       it 'is_expected.to only sync the db if sync_db is enabled' do
@@ -142,7 +143,8 @@ describe 'glance::registry' do
           'hasstatus'  => true,
           'hasrestart' => true,
           'subscribe'  => 'File[/etc/glance/glance-registry.conf]',
-          'require'    => 'Class[Glance]'
+          'require'    => 'Class[Glance]',
+          'tag'        => 'glance-service',
       )}
   end
 
@@ -354,7 +356,7 @@ describe 'glance::registry' do
         let(:params) { default_params.merge({ :package_ensure => package_ensure }) }
         it { is_expected.to contain_package('glance-registry').with(
             :ensure => package_ensure,
-            :tag    => ['openstack']
+            :tag    => ['openstack', 'glance-package']
         )}
       end
     end
@@ -366,7 +368,7 @@ describe 'glance::registry' do
     end
     let(:params) { default_params }
 
-    it { is_expected.to contain_package('openstack-glance')}
+    it { is_expected.to contain_package('openstack-glance') }
   end
 
   describe 'on unknown platforms' do
diff --git a/spec/classes/glance_spec.rb b/spec/classes/glance_spec.rb
index 075cec5e..9910f8ed 100644
--- a/spec/classes/glance_spec.rb
+++ b/spec/classes/glance_spec.rb
@@ -50,7 +50,7 @@ describe 'glance' do
     let(:params) { default_params }
 
     it { is_expected.to contain_package('openstack-glance').with(
-        :tag => ['openstack'],
+        :tag => ['openstack', 'glance-package'],
     )}
   end