diff --git a/resources/keystone_role/actions/remove.yml b/resources/keystone_role/actions/remove.yml
index 386d38e..2a719f4 100644
--- a/resources/keystone_role/actions/remove.yml
+++ b/resources/keystone_role/actions/remove.yml
@@ -2,4 +2,5 @@
   sudo: yes
   tasks:
     - name: keystone role
-      keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} tenant={{tenant_name}} role={{role_name}} state=absent
+    #TODO: not implemented in module
+      pause: seconds=1
diff --git a/resources/keystone_service_endpoint/actions/remove.yaml b/resources/keystone_service_endpoint/actions/remove.yaml
index b15fe77..6721832 100644
--- a/resources/keystone_service_endpoint/actions/remove.yaml
+++ b/resources/keystone_service_endpoint/actions/remove.yaml
@@ -1 +1,6 @@
-#todo
+- hosts: [{{ ip }}]
+  sudo: yes
+  tasks:
+    - name: keystone service and endpoint
+    #TODO: not implemented in module
+      pause: seconds=1
diff --git a/resources/keystone_user/actions/remove.yml b/resources/keystone_user/actions/remove.yml
index a56289d..8ab1004 100644
--- a/resources/keystone_user/actions/remove.yml
+++ b/resources/keystone_user/actions/remove.yml
@@ -2,4 +2,5 @@
   sudo: yes
   tasks:
     - name: keystone user
-      keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} password={{user_password}} tenant={{tenant_name}} state=absent
+    #TODO: not implemented in module
+      pause: seconds=1
diff --git a/resources/rabbitmq_service/actions/run.yml b/resources/rabbitmq_service/actions/run.yml
index f928c29..66d36c7 100644
--- a/resources/rabbitmq_service/actions/run.yml
+++ b/resources/rabbitmq_service/actions/run.yml
@@ -15,3 +15,8 @@
         - {{ management_port }}:15672
         env:
             RABBITMQ_NODENAME: {{container_name}}
+    - shell: docker exec -t {{ name }} rabbitmqctl list_users
+      register: result
+      until: result.rc == 0
+      retries: 20
+      delay: 0.5