diff --git a/tasks/main.yml b/tasks/main.yml
index dc831ff..ec07676 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,20 +11,15 @@
   - name: Wait for ready
     shell: '{{ apigee_all }} wait_for_ready'
 
-  - name: Validate component status
-    shell: '{{ apigee_all }} status'
-    when: opdk_version | version_compare('4.16.01', '>=')
-
   rescue:
 
-    - name: Small time delay for component boot, change with -e component_start_delay=
-      pause:
-        seconds: '{{ component_start_delay | default(1) }}'
-
     - name: Validate status failed, trying component start...
       shell: '{{ apigee_all }} start'
       when: opdk_version | version_compare('4.16.01', '>=')
 
-#- name: Validating component status a second time
-#  shell: '{{ apigee_all }} status'
-#  when: opdk_version | version_compare('4.16.01', '>=')
\ No newline at end of file
+    - name: Wait for ready
+      shell: '{{ apigee_all }} wait_for_ready'
+
+- name: Validating component status
+  shell: '{{ apigee_all }} status'
+  when: opdk_version | version_compare('4.16.01', '>=')
\ No newline at end of file