diff --git a/roles/docker/tasks/cassandra.yml b/roles/docker/tasks/cassandra.yml
index bfb41cc51c5cde37a70932bb73b7258f3f90fa77..2269b8bda2e900f3c6ca846e7982a2feba1c3301 100644
--- a/roles/docker/tasks/cassandra.yml
+++ b/roles/docker/tasks/cassandra.yml
@@ -15,11 +15,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect cassandra containers from network and remove
+- name: Stop cassandra containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['cassandra'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy cassandra containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['cassandra'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/cortex.yml b/roles/docker/tasks/cortex.yml
index ec2ff382474e80492ca4a119b75413dc63f6b47b..cad657308243d2855438d4f6ef582d7d22be1bbe 100644
--- a/roles/docker/tasks/cortex.yml
+++ b/roles/docker/tasks/cortex.yml
@@ -15,10 +15,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect cortex containers from network and remove
+- name: Stop cortex containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['cortex'] }}"
   tags:
     - stop-docker-containers
+
+- name: Destroy cortex containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['cortex'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/haproxy.yml b/roles/docker/tasks/haproxy.yml
index 6353030097ab67757f4b08ca2922afa51070b7fb..f4d25cb324785141a7f0aefbaf1efeac8dc8f744 100644
--- a/roles/docker/tasks/haproxy.yml
+++ b/roles/docker/tasks/haproxy.yml
@@ -25,9 +25,16 @@
   tags:
     - start-docker-containers
 
+- name: Stop haproxy container
+  docker_container:
+    name: "{{ haproxy_name }}"
+    state: stopped
+  tags:
+    - stop-docker-containers
+
 - name: Destroy haproxy container
   docker_container:
     name: "{{ haproxy_name }}"
     state: absent
   tags:
-    - stop-docker-containers
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/keycloak.yml b/roles/docker/tasks/keycloak.yml
index 719344903170c49c8166204108efd2ff99f73e98..8711dfc4060c10695b6c2ce8949f10f309fb0c54 100644
--- a/roles/docker/tasks/keycloak.yml
+++ b/roles/docker/tasks/keycloak.yml
@@ -13,11 +13,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect keycloak containers from network and remove
+- name: Stop keycloak containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['keycloakcontainers'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy keycloak containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['keycloakcontainers'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/misp.yml b/roles/docker/tasks/misp.yml
index acba5eadac6af1f644a5177df1f7c7716afc6492..61038efe8e590f4dacdb7608dd093170ed911dab 100644
--- a/roles/docker/tasks/misp.yml
+++ b/roles/docker/tasks/misp.yml
@@ -12,9 +12,16 @@
   tags:
     - start-docker-containers
 
+- name: Stop misp container
+  docker_container:
+    name: "{{ misp_name }}"
+    state: stopped
+  tags:
+    - stop-docker-containers
+
 - name: Destroy misp container
   docker_container:
     name: "{{ misp_name }}"
     state: absent
   tags:
-    - stop-docker-containers
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/mysql.yml b/roles/docker/tasks/mysql.yml
index d7779da3f7ae3b3ecd514d6dd705a29a4f3fd98c..adcebee58de90011d884c8bfe996308d1b997a19 100644
--- a/roles/docker/tasks/mysql.yml
+++ b/roles/docker/tasks/mysql.yml
@@ -13,9 +13,16 @@
   tags:
     - start-docker-containers
 
+- name: Stop mysql container
+  docker_container:
+    name: "{{ mysql_name }}"
+    state: stopped
+  tags:
+    - stop-docker-containers
+
 - name: Destroy mysql container
   docker_container:
     name: "{{ mysql_name }}"
     state: absent
   tags:
-    - stop-docker-containers
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/networkremove.yml b/roles/docker/tasks/networkremove.yml
index 5a217cea554a724d5d00c87b898b781bd266ddbf..eb7881389a6cef3bc4a44466bf79bc23f5653eae 100644
--- a/roles/docker/tasks/networkremove.yml
+++ b/roles/docker/tasks/networkremove.yml
@@ -5,5 +5,5 @@
     name: "{{ soctools_netname }}"
     state: absent
   tags:
-    - stop-docker-containers
+    - destroy-docker-containers
 
diff --git a/roles/docker/tasks/nifi.yml b/roles/docker/tasks/nifi.yml
index fa32278283ae3aab639460f0e2d010bc700417ab..3df004273cc8d70851da5c585731e2f53c1a71e7 100644
--- a/roles/docker/tasks/nifi.yml
+++ b/roles/docker/tasks/nifi.yml
@@ -15,11 +15,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect Nifi containers from network and remove
+- name: Stop Nifi containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['nificontainers'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy Nifi containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['nificontainers'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/odfees.yml b/roles/docker/tasks/odfees.yml
index 7ae76b5de752ab1ff385f49ffc443387f4196dc4..9d09c301aa2fe5e76027fe99605b8434037d254d 100644
--- a/roles/docker/tasks/odfees.yml
+++ b/roles/docker/tasks/odfees.yml
@@ -15,11 +15,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect odfe elasticsearch containers from network and remove
+- name: Stop odfe elasticsearch containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['odfeescontainers'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy odfe elasticsearch containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['odfeescontainers'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/odfekibana.yml b/roles/docker/tasks/odfekibana.yml
index 8426ce61d2d839917dca6fddfb7166a52f39d7cc..877946c67f27175fb460fdaabb02f5ce145045aa 100644
--- a/roles/docker/tasks/odfekibana.yml
+++ b/roles/docker/tasks/odfekibana.yml
@@ -13,11 +13,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect odfe kibana containers from network and remove
+- name: Stop odfe kibana containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['odfekibanacontainers'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy odfe kibana containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['odfekibanacontainers'] }}"
+  tags:
+    - destroy-docker-containers
diff --git a/roles/docker/tasks/thehive.yml b/roles/docker/tasks/thehive.yml
index 18dc84045eb82814c31ee95dcf49d53db35328e7..2a5a778425d1979835ba9f5625ce8c90918e4d2e 100644
--- a/roles/docker/tasks/thehive.yml
+++ b/roles/docker/tasks/thehive.yml
@@ -13,11 +13,18 @@
   tags:
     - start-docker-containers
 
-- name: Disconnect thehive containers from network and remove
+- name: Stop thehive containers
   docker_container:
     name: "{{ item }}"
-    state: absent
+    state: stopped
   with_items: "{{ groups['thehive'] }}"
   tags:
     - stop-docker-containers
 
+- name: Destroy thehive containers
+  docker_container:
+    name: "{{ item }}"
+    state: absent
+  with_items: "{{ groups['thehive'] }}"
+  tags:
+    - destroy-docker-container
diff --git a/roles/docker/tasks/zookeeper.yml b/roles/docker/tasks/zookeeper.yml
index d0b3f71dd99d6d8192e58c560fa817a43757b66f..c6e4fd52bb56bf46eaf6d54a8fd17d8c6e251aec 100644
--- a/roles/docker/tasks/zookeeper.yml
+++ b/roles/docker/tasks/zookeeper.yml
@@ -13,10 +13,16 @@
   tags:
     - start-docker-containers
 
-- name: Remove zookeeper
+- name: Stop zookeeper Container
   docker_container:
     name: "{{ zookeeper_name }}"
-    state: absent
+    state: stopped
   tags:
     - stop-docker-containers
 
+- name: Destroy zookeeper Container
+  docker_container:
+    name: "{{ zookeeper_name }}"
+    state: absent
+  tags:
+    - destroy-docker-containers
diff --git a/soctools.yml b/soctools.yml
index 4636ad1cde4f44f262b00adbdd3bbc03afb35a4d..acd3b50dbb9316a267bcb0e7d480a2abd5e720b0 100644
--- a/soctools.yml
+++ b/soctools.yml
@@ -2,7 +2,7 @@
 
 - name: Manage Docker Containers
   import_playbook: dockercontainers.yml
-  when: "'start-docker-containers' in ansible_run_tags or 'stop-docker-containers' in ansible_run_tags"
+  when: "'start-docker-containers' in ansible_run_tags or 'stop-docker-containers' in ansible_run_tags or 'destroy-docker-containers' in ansible_run_tags"
 
 - name: Init and start soctools cluster
   import_playbook: initsoctools.yml