diff --git a/manifests/client.pp b/manifests/client.pp
index 35748c095..024dd300a 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -14,7 +14,7 @@ class nova::client(
 
   package { 'python-novaclient':
     ensure => $ensure,
-    tag    => ['openstack', 'nova'],
+    tag    => ['openstack'],
   }
 
 }
diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 2af2455d7..67c4c4f8d 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -117,7 +117,7 @@ class nova::compute::libvirt (
       ensure  => present,
       before  => Package['nova-compute'],
       require => Package['nova-common'],
-      tag     => ['openstack', 'nova'],
+      tag     => ['openstack'],
     }
   }
 
diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp
index 3328ba5f7..2c6a38a9b 100644
--- a/manifests/generic_service.pp
+++ b/manifests/generic_service.pp
@@ -37,7 +37,7 @@ define nova::generic_service(
         ensure => $ensure_package,
         name   => $package_name,
         notify => Service[$nova_title],
-        tag    => ['openstack', 'nova'],
+        tag    => ['openstack'],
       }
     }
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index b520f195a..071f52ac4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -401,14 +401,14 @@ class nova(
   package { 'python-nova':
     ensure  => $ensure_package,
     require => Package['python-greenlet'],
-    tag     => ['openstack', 'nova'],
+    tag     => ['openstack'],
   }
 
   package { 'nova-common':
     ensure  => $ensure_package,
     name    => $::nova::params::common_package_name,
     require => [Package['python-nova'], Anchor['nova-start']],
-    tag     => ['openstack', 'nova'],
+    tag     => ['openstack'],
   }
 
   file { '/etc/nova/nova.conf':
diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb
index 716eba4da..0486fd6f3 100644
--- a/spec/classes/nova_api_spec.rb
+++ b/spec/classes/nova_api_spec.rb
@@ -29,7 +29,7 @@ describe 'nova::api' do
           :name   => platform_params[:nova_api_package],
           :ensure => 'present',
           :notify => 'Service[nova-api]',
-          :tag    => ['openstack', 'nova']
+          :tag    => ['openstack']
         )
         should_not contain_exec('validate_nova_api')
       end
@@ -106,7 +106,7 @@ describe 'nova::api' do
         should contain_package('nova-api').with(
           :name   => platform_params[:nova_api_package],
           :ensure => '2012.1-2',
-          :tag    => ['openstack', 'nova']
+          :tag    => ['openstack']
         )
         should contain_service('nova-api').with(
           :name      => platform_params[:nova_api_service],
diff --git a/spec/classes/nova_cells_spec.rb b/spec/classes/nova_cells_spec.rb
index f6e1a67ba..f8cbc01be 100644
--- a/spec/classes/nova_cells_spec.rb
+++ b/spec/classes/nova_cells_spec.rb
@@ -61,7 +61,7 @@ describe 'nova::cells' do
       should contain_package('nova-cells').with(
         :ensure => 'present',
         :name   => platform_params[:cells_package_name],
-        :tag    => ['openstack', 'nova']
+        :tag    => ['openstack']
       )
     end
 
diff --git a/spec/classes/nova_client_spec.rb b/spec/classes/nova_client_spec.rb
index 4caae33aa..a1c5cbfba 100644
--- a/spec/classes/nova_client_spec.rb
+++ b/spec/classes/nova_client_spec.rb
@@ -6,7 +6,7 @@ describe 'nova::client' do
     it {
       should contain_package('python-novaclient').with(
         :ensure => 'present',
-        :tag    => ['openstack', 'nova']
+        :tag    => ['openstack']
       )
     }
   end
diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb
index d2c6785a8..1e37f80d3 100644
--- a/spec/classes/nova_compute_libvirt_spec.rb
+++ b/spec/classes/nova_compute_libvirt_spec.rb
@@ -17,7 +17,7 @@ describe 'nova::compute::libvirt' do
       it { should contain_package('nova-compute-kvm').with(
         :ensure => 'present',
         :before => 'Package[nova-compute]',
-        :tag    => ['openstack', 'nova']
+        :tag    => ['openstack']
       ) }
 
       it { should contain_package('libvirt').with(
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index aa977db3c..84bf130c9 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -19,7 +19,7 @@ describe 'nova::compute' do
         })
         should contain_package('nova-compute').with({
           :name => platform_params[:nova_compute_package],
-          :tag  => ['openstack', 'nova']
+          :tag  => ['openstack']
         })
       end
 
@@ -71,7 +71,7 @@ describe 'nova::compute' do
         should contain_package('nova-compute').with({
           :name   => platform_params[:nova_compute_package],
           :ensure => '2012.1-2',
-          :tag    => ['openstack', 'nova']
+          :tag    => ['openstack']
         })
       end
 
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 4f8964e8f..e2da5a0b8 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -19,7 +19,7 @@ describe 'nova' do
         should contain_package('nova-common').with(
           :name    => platform_params[:nova_common_package],
           :ensure  => 'present',
-          :tag    => ['openstack', 'nova']
+          :tag    => ['openstack']
         )
       end
 
diff --git a/spec/shared_examples.rb b/spec/shared_examples.rb
index b7b16517e..bbc8a463c 100644
--- a/spec/shared_examples.rb
+++ b/spec/shared_examples.rb
@@ -12,7 +12,7 @@ shared_examples 'generic nova service' do |service|
         :name   => service[:package_name],
         :ensure => 'present',
         :notify => "Service[#{service[:name]}]",
-        :tag    => ['openstack', 'nova']
+        :tag    => ['openstack']
       })
       should contain_service(service[:name]).with({
         :name      => service[:service_name],