diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp
index bb70fda..53d46a7 100644
--- a/manifests/generic_service.pp
+++ b/manifests/generic_service.pp
@@ -68,6 +68,7 @@ define tuskar::generic_service(
         ensure => $package_ensure,
         name   => $package_name,
         notify => Service[$tuskar_title],
+        tag    => ['openstack', 'tuskar'],
       }
     }
   }
@@ -86,6 +87,7 @@ define tuskar::generic_service(
       name      => $service_name,
       enable    => $enabled,
       hasstatus => true,
+      tag       => 'tuskar',
     }
   }
 }
diff --git a/manifests/ui.pp b/manifests/ui.pp
index 4d591b1..653e9a6 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -39,12 +39,14 @@ class tuskar::ui (
   package { 'tuskar-ui':
     ensure => $package_ensure,
     name   => $::tuskar::params::ui_package_name,
+    tag    => ['openstack', 'tuskar'],
   }
 
   if $extras {
     package { 'tuskar-ui-extras':
       ensure => $package_ensure,
       name   => $::tuskar::params::ui_extras_package_name,
+      tag    => ['openstack', 'tuskar'],
     }
   }
 
diff --git a/spec/classes/tuskar_ui_spec.rb b/spec/classes/tuskar_ui_spec.rb
index e0710be..6044174 100644
--- a/spec/classes/tuskar_ui_spec.rb
+++ b/spec/classes/tuskar_ui_spec.rb
@@ -12,6 +12,7 @@ describe 'tuskar::ui' do
         should contain_package('tuskar-ui').with(
           :name   => platform_params[:ui_package_name],
           :ensure => 'present',
+          :tag    => ['openstack', 'tuskar'],
         )
         should_not contain_package('tuskar-ui-extras')
       end
@@ -25,10 +26,12 @@ describe 'tuskar::ui' do
         should contain_package('tuskar-ui').with(
           :name   => platform_params[:ui_package_name],
           :ensure => 'present',
+          :tag    => ['openstack', 'tuskar'],
         )
         should contain_package('tuskar-ui-extras').with(
           :name   => platform_params[:ui_extras_package_name],
           :ensure => 'present',
+          :tag    => ['openstack', 'tuskar'],
         )
       end
     end
@@ -41,6 +44,7 @@ describe 'tuskar::ui' do
         should contain_package('tuskar-ui').with(
           :name   => platform_params[:ui_package_name],
           :ensure => 'absent',
+          :tag    => ['openstack', 'tuskar'],
         )
       end
     end
diff --git a/spec/shared_examples.rb b/spec/shared_examples.rb
index dd4ff33..ceeb46f 100644
--- a/spec/shared_examples.rb
+++ b/spec/shared_examples.rb
@@ -11,13 +11,15 @@ shared_examples 'generic Tuskar service' do |service|
       is_expected.to contain_package(service[:name]).with({
         :name   => service[:package_name],
         :ensure => 'present',
-        :notify => "Service[#{service[:name]}]"
+        :notify => "Service[#{service[:name]}]",
+        :tag    => ['openstack', 'tuskar'],
       })
       is_expected.to contain_service(service[:name]).with({
         :name      => service[:service_name],
         :ensure    => 'stopped',
         :hasstatus => true,
-        :enable    => false
+        :enable    => false,
+        :tag       => 'tuskar',
       })
     end
   end
@@ -32,13 +34,15 @@ shared_examples 'generic Tuskar service' do |service|
       is_expected.to contain_package(service[:name]).with({
         :name   => service[:package_name],
         :ensure => '2014.1-1',
-        :notify => "Service[#{service[:name]}]"
+        :notify => "Service[#{service[:name]}]",
+        :tag    => ['openstack', 'tuskar'],
       })
       is_expected.to contain_service(service[:name]).with({
         :name      => service[:service_name],
         :ensure    => 'running',
         :hasstatus => true,
-        :enable    => true
+        :enable    => true,
+        :tag       => 'tuskar',
       })
     end
   end