diff --git a/tasks/main.yml b/tasks/main.yml
index 6abae2c..a08f8c0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,27 +3,15 @@
 #- block:
 - name: Perform component update - {{ apigee_component }}
   shell: '{{ apigee_update }} -c {{ component }} -f {{ opdk_installation_config_file }}'
-#    ignore_errors: yes
 
-#  - name: Wait for ready
-#    shell: '{{ apigee_all }} wait_for_ready'
-#    when: validate_ready | default(true)
-##    ignore_errors: yes
-
-#  rescue:
-
-#    - name: Validate status failed, trying component start...
-- name: Validate status failed, trying component start...
+- name: Validate component starts
   shell: '{{ apigee_all }} start'
   when: opdk_version | version_compare('4.16.01', '>=')
-#      ignore_errors: "{{ ignore_errors | default(false) }}"
 
-#    - name: Wait for ready
-#      ignore_errors: "{{ ignore_errors | default(false) }}"
-#      shell: '{{ apigee_all }} wait_for_ready'
-#      when: validate_ready | default(true)
+- name: Wait for ready
+  shell: '{{ apigee_all }} wait_for_ready'
+  when: validate_ready | default(true)
 
-- name: Validating component status
-#  ignore_errors: "{{ ignore_errors | default(false) }}"
+- name: Component status
   shell: '{{ apigee_all }} status'
   when: validate_ready | default(true) and opdk_version | version_compare('4.16.01', '>=')