diff --git a/tasks/main.yml b/tasks/main.yml
index c34f342..0b9dcfc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,22 +1,27 @@
 ---
 # tasks file for apigee-opdk-start-components
-- name: Stop all Apigee components on the node
-  ignore_errors: yes
-  shell: '{{ apigee_all }} stop'
-  when: component_name == 'all' and opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+- block:
+  - name: Stop all Apigee components on the node
+    ignore_errors: yes
+    shell: '{{ apigee_all }} stop'
+    when: opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
-- name: Stop a specific Apigee component on the node
-  ignore_errors: yes
-  shell: '{{ apigee_service }} {{ component_name }} stop'
-  when: component_name != 'all' and opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+  - name: DEBUG_MODE - Stop all Apigee components on the node
+    ignore_errors: yes
+    shell: '{{ apigee_all }} stop'
+    when: opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
-- name: DEBUG_MODE - Stop all Apigee components on the node
-  ignore_errors: yes
-  shell: '{{ apigee_all }} stop'
-  when: component_name == 'all' and opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  when: component_name == 'all'
 
-- name: DEBUG_MODE - Stop a specific Apigee component on the node
-  ignore_errors: yes
-  shell: '{{ apigee_service }} {{ component_name }} stop'
-  when: component_name != 'all' and opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+- block:
+  - name: Stop a specific Apigee component on the node
+    ignore_errors: yes
+    shell: '{{ apigee_service }} {{ component_name }} stop'
+    when: opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
+  - name: DEBUG_MODE - Stop a specific Apigee component on the node
+    ignore_errors: yes
+    shell: '{{ apigee_service }} {{ component_name }} stop'
+    when: opdk_version | version_compare('4.16.01', '>=') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
+  when: component_name != 'all'