diff --git a/ansible/roles/docker-registry/tasks/deploy.yml b/ansible/roles/docker-registry/tasks/deploy.yml
index 9f643d29e..73b37b913 100644
--- a/ansible/roles/docker-registry/tasks/deploy.yml
+++ b/ansible/roles/docker-registry/tasks/deploy.yml
@@ -8,6 +8,6 @@
     read_only: "{{ item.value.read_only | default(omit) }}"
     restart_policy: "{{ docker_registry_restart_policy }}"
     restart_retries: "{{ docker_registry_restart_retries | default(omit) }}"
-    state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}"
+    state: "{{ item.value.enabled | ternary('started', 'absent') }}"
     volumes: "{{ item.value.volumes }}"
   with_dict: "{{ docker_registry_services }}"
diff --git a/ansible/roles/docker-registry/tasks/destroy.yml b/ansible/roles/docker-registry/tasks/destroy.yml
index 2f40ffc0e..8b1302463 100644
--- a/ansible/roles/docker-registry/tasks/destroy.yml
+++ b/ansible/roles/docker-registry/tasks/destroy.yml
@@ -1,5 +1,9 @@
 ---
-- include: deploy.yml
+- name: Ensure docker registry container is stopped
+  docker_container:
+    name: "{{ item.value.container_name }}"
+    state: "absent"
+  with_dict: "{{ docker_registry_services }}"
 
 - name: Check whether docker registry volumes are present
   command: docker volume inspect {{ volume }}
diff --git a/ansible/roles/node-exporter/tasks/deploy.yml b/ansible/roles/node-exporter/tasks/deploy.yml
index 77bf772a7..27bf269c5 100644
--- a/ansible/roles/node-exporter/tasks/deploy.yml
+++ b/ansible/roles/node-exporter/tasks/deploy.yml
@@ -9,6 +9,6 @@
     read_only: "{{ item.value.read_only | default(omit) }}"
     restart_policy: "{{ nodeexporter_restart_policy }}"
     restart_retries: "{{ nodeexporter_restart_retries | default(omit) }}"
-    state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}"
+    state: "{{ item.value.enabled | ternary('started', 'absent') }}"
     volumes: "{{ item.value.volumes }}"
   with_dict: "{{ nodeexporter_services }}"
diff --git a/ansible/roles/node-exporter/tasks/destroy.yml b/ansible/roles/node-exporter/tasks/destroy.yml
index dfdabfb69..a51e4f74a 100644
--- a/ansible/roles/node-exporter/tasks/destroy.yml
+++ b/ansible/roles/node-exporter/tasks/destroy.yml
@@ -1,5 +1,9 @@
 ---
-- include: deploy.yml
+- name: Ensure node exporter container is stopped
+  docker_container:
+    name: "{{ item.value.container_name }}"
+    state: "absent"
+  with_dict: "{{ nodeexporter_services }}"
 
 - name: Check whether Node Exporter volumes are present
   command: docker volume inspect {{ volume }}
diff --git a/ansible/roles/opensm/tasks/deploy.yml b/ansible/roles/opensm/tasks/deploy.yml
index 3ad3f02ea..d471e96dc 100644
--- a/ansible/roles/opensm/tasks/deploy.yml
+++ b/ansible/roles/opensm/tasks/deploy.yml
@@ -8,6 +8,6 @@
     read_only: "{{ item.value.read_only | default(omit) }}"
     restart_policy: "{{ opensm_restart_policy }}"
     restart_retries: "{{ opensm_restart_retries | default(omit) }}"
-    state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}"
+    state: "{{ item.value.enabled | ternary('started', 'absent') }}"
     volumes: "{{ item.value.volumes }}"
   with_dict: "{{ opensm_services }}"
diff --git a/ansible/roles/opensm/tasks/destroy.yml b/ansible/roles/opensm/tasks/destroy.yml
index 9be7f3e7a..ac1dd9da1 100644
--- a/ansible/roles/opensm/tasks/destroy.yml
+++ b/ansible/roles/opensm/tasks/destroy.yml
@@ -1,5 +1,9 @@
 ---
-- include: deploy.yml
+- name: Ensure OpenSM container is stopped
+  docker_container:
+    name: "{{ item.value.container_name }}"
+    state: "absent"
+  with_dict: "{{ opensm_services }}"
 
 - name: Check whether OpenSM volumes are present
   command: docker volume inspect {{ volume }}