diff --git a/manifests/init.pp b/manifests/init.pp
index 7416c58a..82e99610 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,7 +41,7 @@ class swift(
     package { 'swift':
       ensure => $package_ensure,
       name   => $::swift::params::package_name,
-      tag    => 'openstack',
+      tag    => ['openstack', 'swift-package'],
     }
   }
 
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index e4dbcd83..93f809d7 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -170,7 +170,7 @@ class swift::proxy(
   package { 'swift-proxy':
     ensure => $package_ensure,
     name   => $::swift::params::proxy_package_name,
-    tag    => 'openstack',
+    tag    => ['openstack', 'swift-package'],
   }
 
   concat { '/etc/swift/proxy-server.conf':
@@ -215,5 +215,6 @@ class swift::proxy(
     provider  => $::swift::params::service_provider,
     hasstatus => true,
     subscribe => Concat['/etc/swift/proxy-server.conf'],
+    tag       => 'swift-service',
   }
 }
diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp
index 72f130ca..6ea12246 100644
--- a/manifests/storage/account.pp
+++ b/manifests/storage/account.pp
@@ -44,6 +44,7 @@ class swift::storage::account(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-account'],
+    tag      => 'swift-service',
   }
 
   service { 'swift-account-auditor':
@@ -52,5 +53,6 @@ class swift::storage::account(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-account'],
+    tag      => 'swift-service',
   }
 }
diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
index aa054f52..f5137f0a 100644
--- a/manifests/storage/container.pp
+++ b/manifests/storage/container.pp
@@ -49,6 +49,7 @@ class swift::storage::container(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-container'],
+    tag      => 'swift-service',
   }
 
   service { 'swift-container-auditor':
@@ -57,6 +58,7 @@ class swift::storage::container(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-container'],
+    tag      => 'swift-service',
   }
 
   if $::operatingsystem == 'Ubuntu' {
diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
index 88948d01..df36d42e 100644
--- a/manifests/storage/generic.pp
+++ b/manifests/storage/generic.pp
@@ -47,7 +47,7 @@ define swift::storage::generic(
     # this is a way to dynamically build the variables to lookup
     # sorry its so ugly :(
     name   => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"),
-    tag    => 'openstack',
+    tag    => ['openstack', 'swift-package'],
     before => Service["swift-${name}", "swift-${name}-replicator"],
   }
 
@@ -72,6 +72,7 @@ define swift::storage::generic(
     hasstatus => true,
     provider  => $service_provider,
     subscribe => Package["swift-${name}"],
+    tag       => 'swift-service',
   }
 
   service { "swift-${name}-replicator":
@@ -81,6 +82,7 @@ define swift::storage::generic(
     hasstatus => true,
     provider  => $service_provider,
     subscribe => Package["swift-${name}"],
+    tag       => 'swift-service',
   }
 
 }
diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp
index 243e0d97..12d044d8 100644
--- a/manifests/storage/object.pp
+++ b/manifests/storage/object.pp
@@ -44,6 +44,7 @@ class swift::storage::object(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-object'],
+    tag      => 'swift-service',
   }
 
   service { 'swift-object-auditor':
@@ -52,5 +53,6 @@ class swift::storage::object(
     enable   => $enabled,
     provider => $::swift::params::service_provider,
     require  => Package['swift-object'],
+    tag      => 'swift-service',
   }
 }
diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb
index 0cc3b035..938657ad 100644
--- a/spec/classes/swift_proxy_spec.rb
+++ b/spec/classes/swift_proxy_spec.rb
@@ -42,7 +42,8 @@ describe 'swift::proxy' do
          :provider  => 'upstart',
          :enable    => true,
          :hasstatus => true,
-         :subscribe => 'Concat[/etc/swift/proxy-server.conf]'
+         :subscribe => 'Concat[/etc/swift/proxy-server.conf]',
+         :tag       => 'swift-service',
         }
       )}
       it { is_expected.to contain_file('/etc/swift/proxy-server.conf').with(
diff --git a/spec/classes/swift_storage_account_spec.rb b/spec/classes/swift_storage_account_spec.rb
index c52d8b20..c1473ce9 100644
--- a/spec/classes/swift_storage_account_spec.rb
+++ b/spec/classes/swift_storage_account_spec.rb
@@ -38,7 +38,8 @@ describe 'swift::storage::account' do
             is_expected.to contain_service(service_alias).with(
               :name    => service_name,
               :ensure  => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running' : 'stopped',
-              :enable  => param_hash[:enabled]
+              :enable  => param_hash[:enabled],
+              :tag     => 'swift-service',
             )
           end
         end
@@ -57,7 +58,8 @@ describe 'swift::storage::account' do
           is_expected.to contain_service(service_alias).with(
             :ensure    => nil,
             :name      => service_name,
-            :enable    => false
+            :enable    => false,
+            :tag       => 'swift-service',
           )
         end
       end
diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb
index e262cbab..da1a6bcd 100644
--- a/spec/classes/swift_storage_container_spec.rb
+++ b/spec/classes/swift_storage_container_spec.rb
@@ -38,7 +38,8 @@ describe 'swift::storage::container' do
             is_expected.to contain_service(service_alias).with(
               :name    => service_name,
               :ensure  => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running' : 'stopped',
-              :enable  => param_hash[:enabled]
+              :enable  => param_hash[:enabled],
+              :tag     => 'swift-service',
             )
           end
         end
@@ -57,7 +58,8 @@ describe 'swift::storage::container' do
           is_expected.to contain_service(service_alias).with(
             :ensure    => nil,
             :name      => service_name,
-            :enable    => false
+            :enable    => false,
+            :tag       => 'swift-service',
           )
         end
       end
diff --git a/spec/classes/swift_storage_object_spec.rb b/spec/classes/swift_storage_object_spec.rb
index e10fdca2..7cbd1c2a 100644
--- a/spec/classes/swift_storage_object_spec.rb
+++ b/spec/classes/swift_storage_object_spec.rb
@@ -39,7 +39,8 @@ describe 'swift::storage::object' do
             is_expected.to contain_service(service_alias).with(
               :name    => service_name,
               :ensure  => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running' : 'stopped',
-              :enable  => param_hash[:enabled]
+              :enable  => param_hash[:enabled],
+              :tag     => 'swift-service',
             )
           end
         end
@@ -58,7 +59,8 @@ describe 'swift::storage::object' do
           is_expected.to contain_service(service_alias).with(
             :ensure    => nil,
             :name      => service_name,
-            :enable    => false
+            :enable    => false,
+            :tag       => 'swift-service',
           )
         end
       end
diff --git a/spec/defines/swift_storage_generic_spec.rb b/spec/defines/swift_storage_generic_spec.rb
index 2e0dae31..fe94b8a7 100644
--- a/spec/defines/swift_storage_generic_spec.rb
+++ b/spec/defines/swift_storage_generic_spec.rb
@@ -47,19 +47,21 @@ describe 'swift::storage::generic' do
         end
         it { is_expected.to contain_package("swift-#{t}").with(
           :ensure => param_hash[:package_ensure],
-          :tag    => 'openstack'
+          :tag    => ['openstack', 'swift-package'],
         )}
         it { is_expected.to contain_service("swift-#{t}").with(
           :ensure    => 'running',
           :enable    => true,
           :hasstatus => true,
-          :provider  => param_hash[:service_provider]
+          :provider  => param_hash[:service_provider],
+          :tag       => 'swift-service',
         )}
         it { is_expected.to contain_service("swift-#{t}-replicator").with(
           :ensure    => 'running',
           :enable    => true,
           :hasstatus => true,
-          :provider  => param_hash[:service_provider]
+          :provider  => param_hash[:service_provider],
+          :tag       => 'swift-service',
         )}
         it { is_expected.to contain_file("/etc/swift/#{t}-server/").with(
           :ensure => 'directory',