diff --git a/tasks/main.yml b/tasks/main.yml
index 7242470..3ec3366 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,20 +7,20 @@
     shell: '{{ apigee_service }} {{ component_name }} start'
     when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
-#  - name: Wait for ready on a specific Apigee component
-##    ignore_errors: "{{ ignore_errors | default (true) }}"
-#    shell: '{{ apigee_service }} {{ component_name }} wait_for_ready'
-#    when: validate_ready | default(true) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+  - name: Wait for ready on a specific Apigee component
+#    ignore_errors: "{{ ignore_errors | default (true) }}"
+    shell: '{{ apigee_service }} {{ component_name }} wait_for_ready'
+    when: validate_ready | default(true) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
   - name: DEBUG_MODE - Start a specific Apigee component on the node
 #    ignore_errors: "{{ ignore_errors | default (true) }}"
     shell: '{{ apigee_service }} {{ component_name }} start'
     when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
-#  - name: DEBUG_MODE - Wait for ready on a specific Apigee component
-##    ignore_errors: "{{ ignore_errors | default (true) }}"
-#    shell: '{{ apigee_service }} {{ component_name }} wait_for_ready'
-#    when: validate_ready | default(true) and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  - name: DEBUG_MODE - Wait for ready on a specific Apigee component
+#    ignore_errors: "{{ ignore_errors | default (true) }}"
+    shell: '{{ apigee_service }} {{ component_name }} wait_for_ready'
+    when: validate_ready | default(true) and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
   when: component_name != 'all' and opdk_version | version_compare('4.16.01', '>=')
 
@@ -31,19 +31,19 @@
     shell: '{{ apigee_all }} start'
     when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
-#  - name: Wait for ready on all Apigee components on the node
+  - name: Wait for ready on all Apigee components on the node
 #    ignore_errors: "{{ ignore_errors | default (true) }}"
-#    shell: '{{ apigee_all }} wait_for_ready'
-#    when: validate_ready | default(true) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+    shell: '{{ apigee_all }} wait_for_ready'
+    when: validate_ready | default(true) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
   - name: DEBUG_MODE - Start all Apigee components on the node
 #    ignore_errors: "{{ ignore_errors | default (true) }}"
     shell: '{{ apigee_all }} start'
     when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
-#  - name: DEBUG_MODE - Wait for ready on all Apigee components on the node
-##    ignore_errors: "{{ ignore_errors | default (true) }}"
-#    shell: '{{ apigee_all }} wait_for_ready'
-#    when: validate_ready | default(true) and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  - name: DEBUG_MODE - Wait for ready on all Apigee components on the node
+#    ignore_errors: "{{ ignore_errors | default (true) }}"
+    shell: '{{ apigee_all }} wait_for_ready'
+    when: validate_ready | default(true) and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
   when: component_name is not defined or (component_name == 'all' and opdk_version | version_compare('4.16.01', '>=') )