diff --git a/manifests/api.pp b/manifests/api.pp
index 95eba68e..0682bb37 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -92,11 +92,7 @@ class manila::api (
     warning('service port is deprecated and will be removed in a future release')
   }
 
-  Manila_config<||> ~> Service['manila-api']
-  Manila_api_paste_ini<||> ~> Service['manila-api']
-
   if $::manila::params::api_package {
-    Package['manila-api'] -> Service['manila-api']
     package { 'manila-api':
       ensure => $package_ensure,
       name   => $::manila::params::api_package,
@@ -123,7 +119,6 @@ class manila::api (
     name      => $::manila::params::api_service,
     enable    => $enabled,
     hasstatus => true,
-    require   => Package['manila'],
     tag       => 'manila-service',
   }
 
@@ -157,5 +152,4 @@ class manila::api (
       }
     }
   }
-
 }
diff --git a/manifests/type.pp b/manifests/type.pp
index 5c390c60..f42ee1e4 100644
--- a/manifests/type.pp
+++ b/manifests/type.pp
@@ -69,7 +69,7 @@ define manila::type (
     command     => "manila type-create ${volume_name} ${driver_handles_share_servers}",
     unless      => "manila type-list | grep ${volume_name}",
     environment => concat($manila_env, $region_env),
-    require     => Package['python-manilaclient'],
+    require     => Anchor['manila::install::end'],
     path        => ['/usr/bin', '/bin'],
   }
 
diff --git a/manifests/type_set.pp b/manifests/type_set.pp
index 9f238fe2..bcc4888b 100644
--- a/manifests/type_set.pp
+++ b/manifests/type_set.pp
@@ -62,6 +62,6 @@ define manila::type_set (
     path        => ['/usr/bin', '/bin'],
     command     => "manila type-key ${type} set ${key}=${name}",
     environment => concat($manila_env, $region_env),
-    require     => Anchor['manila-support-package'],
+    require     => Anchor['manila::install::end'],
   }
 }
diff --git a/spec/defines/manila_type_set_spec.rb b/spec/defines/manila_type_set_spec.rb
index a5f077dc..b9282e2b 100644
--- a/spec/defines/manila_type_set_spec.rb
+++ b/spec/defines/manila_type_set_spec.rb
@@ -27,7 +27,7 @@ describe 'manila::type_set' do
           'OS_USERNAME=admin',
           'OS_PASSWORD=asdf',
           'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'],
-        :require => 'Anchor[manila-support-package]')
+        :require => 'Anchor[manila::install::end]')
     end
   end
 
diff --git a/spec/defines/manila_type_spec.rb b/spec/defines/manila_type_spec.rb
index ecfca2f5..09fdd3e2 100644
--- a/spec/defines/manila_type_spec.rb
+++ b/spec/defines/manila_type_spec.rb
@@ -29,7 +29,7 @@ describe 'manila::type' do
           'OS_PASSWORD=asdf',
           'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'],
         :unless  => 'manila type-list | grep hippo',
-        :require => 'Package[python-manilaclient]')
+        :require => 'Anchor[manila::install::end]')
       is_expected.to contain_exec('manila type-key hippo set volume_backend_name=name1')
       is_expected.to contain_exec('manila type-key hippo set volume_backend_name=name2')
     end