diff --git a/resources/glance_puppet/actions/remove.pp b/resources/glance_puppet/actions/remove.pp
index 6e80ce19..b825ba6c 100644
--- a/resources/glance_puppet/actions/remove.pp
+++ b/resources/glance_puppet/actions/remove.pp
@@ -1,9 +1,11 @@
 $resource = hiera($::resource_name)
 
-class {'glance::api':
-  enabled                   => false,
-}
+include glance::params
 
 class {'glance':
-  package_ensure       => 'absent'
+  package_ensure => 'absent',
+}
+
+package { [$glance::params::api_package_name, $::glance::params::package_name] :
+  ensure => 'absent',
 }
diff --git a/resources/glance_registry_puppet/actions/remove.pp b/resources/glance_registry_puppet/actions/remove.pp
index e4388521..5e62e4cf 100644
--- a/resources/glance_registry_puppet/actions/remove.pp
+++ b/resources/glance_registry_puppet/actions/remove.pp
@@ -1,6 +1,7 @@
 $resource = hiera($::resource_name)
 
 class {'glance::registry':
-  enabled        => false,
-  package_ensure => 'absent',
+  enabled           => false,
+  package_ensure    => 'absent',
+  keystone_password => 'not important as removed'
 }