diff --git a/tasks/main.yml b/tasks/main.yml
index eeff424..4f86a5d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -67,7 +67,7 @@
       no_proxy: "{{ no_proxy }}"
       PORT_TIMEOUT: '{{ port_timeout | default(60) }}'
       UP_TIMEOUT: '{{ up_timeout | default(60) }}'
-    when: validate_ready | default(true) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+    when: wait_for_ready | default(false) and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
   - name: DEBUG_MODE - Start all Apigee components on the node
     shell: '{{ apigee_all }} start'
@@ -88,6 +88,6 @@
       no_proxy: "{{ no_proxy }}"
       PORT_TIMEOUT: '{{ port_timeout | default(60) }}'
       UP_TIMEOUT: '{{ up_timeout | default(60) }}'
-    when: validate_ready | default(true) and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+    when: wait_for_ready | default(false) 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', '>=') )