diff --git a/tasks/main.yml b/tasks/main.yml
index d854cb2..7ed8916 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,23 +17,29 @@
     - name: Postgres replication standby
       shell: '{{ apigee_service }} apigee-postgresql setup-replication-on-standby -f {{ opdk_installation_config_file }}'
 
-- block:
-  - name: Ensure component is started
-    shell: "{{ apigee_service }} apigee-postgresql start"
+#- block:
+- name: Ensure component is started
+  shell: "{{ apigee_service }} apigee-postgresql start"
 
-  - name: Wait for ready
-    command: '{{ apigee_all }} wait_for_ready'
-    when: validate_ready | default(true)
+- name: Give the server some extra time
+  pause:
+    minute: 1
+  when: opdk_version | version_compare('4.17.01', '>=') and opdk_version | version_compare('4.17.09', '<=')
 
-  - name: Validate postgres replication standby
-    shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
-  rescue:
-    - name: Ensure component is started
-      shell: "{{ apigee_service }} apigee-postgresql start"
+- name: Wait for ready
+  command: '{{ apigee_all }} wait_for_ready'
+  when: validate_ready | default(true)
 
-    - name: Wait for ready
-      command: '{{ apigee_all }} wait_for_ready'
-      when: validate_ready | default(true)
+- name: Validate postgres replication standby
+  shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
 
-    - name: Validate postgres replication standby
-      shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
+#  rescue:
+#    - name: Ensure component is started
+#      shell: "{{ apigee_service }} apigee-postgresql start"
+#
+#    - name: Wait for ready
+#      command: '{{ apigee_all }} wait_for_ready'
+#      when: validate_ready | default(true)
+#
+#    - name: Validate postgres replication standby
+#      shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'