diff --git a/resources/keystone_service_endpoint/actions/remove.yaml b/resources/keystone_service_endpoint/actions/remove.yaml
index dadc9aea..cf415ce2 100644
--- a/resources/keystone_service_endpoint/actions/remove.yaml
+++ b/resources/keystone_service_endpoint/actions/remove.yaml
@@ -16,5 +16,5 @@
         adminurl: {{adminurl}}
         region: "RegionOne"
         state: present
-        endpoint: http://{{keystone_host}}:{{keystone_port}}/v2.0/
+        endpoint: http://{{keystone_host}}:{{keystone_admin_port}}/v2.0/
 
diff --git a/resources/neutron_puppet/actions/remove.pp b/resources/neutron_puppet/actions/remove.pp
index 79cafbf6..d6967955 100644
--- a/resources/neutron_puppet/actions/remove.pp
+++ b/resources/neutron_puppet/actions/remove.pp
@@ -1,4 +1,4 @@
-$resource = hiera('{{ name }}')
+$resource = hiera('{{ resource_name }}')
 
 $rabbitmq_user = $resource['input']['rabbitmq_user']['value']
 $rabbitmq_password = $resource['input']['rabbitmq_password']['value']