diff --git a/resources/glance_api_service/actions/remove.yml b/resources/glance_api_service/actions/remove.yml
index d3c3149f..36c74c18 100644
--- a/resources/glance_api_service/actions/remove.yml
+++ b/resources/glance_api_service/actions/remove.yml
@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - name: glance api container
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent
diff --git a/resources/glance_registry_service/actions/remove.yml b/resources/glance_registry_service/actions/remove.yml
index d3c3149f..a7c29381 100644
--- a/resources/glance_registry_service/actions/remove.yml
+++ b/resources/glance_registry_service/actions/remove.yml
@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - name: glance registry container
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent
diff --git a/resources/haproxy_service/actions/remove.yml b/resources/haproxy_service/actions/remove.yml
index d3c3149f..a686005d 100644
--- a/resources/haproxy_service/actions/remove.yml
+++ b/resources/haproxy_service/actions/remove.yml
@@ -1,6 +1,8 @@
-
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - name: haproxy container
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: absent
diff --git a/resources/keystone_service/actions/remove.yml b/resources/keystone_service/actions/remove.yml
index 76142acf..ea815de9 100644
--- a/resources/keystone_service/actions/remove.yml
+++ b/resources/keystone_service/actions/remove.yml
@@ -2,5 +2,8 @@
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker stop {{ name }}
-    - shell: docker rm {{ name }}
+    - name: keystone container
+      docker:
+        image: {{ image }}
+        name: {{ name }}
+        state: absent
diff --git a/resources/rabbitmq_service/actions/remove.yml b/resources/rabbitmq_service/actions/remove.yml
index 3230633a..77d2b98a 100644
--- a/resources/rabbitmq_service/actions/remove.yml
+++ b/resources/rabbitmq_service/actions/remove.yml
@@ -1,4 +1,3 @@
-# TODO
 - hosts: [{{ ip }}]
   sudo: yes
   tasks: