diff --git a/upgrade.yml b/upgrade.yml
index 401063f..0357577 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -199,14 +199,14 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role:  apigee-opdk-start-components, component_name: 'edge-postgres-server', component_start_delay: 10 }
-  - { role:  apigee-opdk-start-components, component_name: 'apigee-postgresql', component_start_delay: 10 }
+  - { role:  apigee-opdk-start-components, component_name: 'edge-postgres-server', component_start_delay: 1 }
+  - { role:  apigee-opdk-start-components, component_name: 'apigee-postgresql', component_start_delay: 1 }
 
 - name: Start Qpid components
   hosts: qpid
   tags: ['pg', 'pgstart']
   roles:
-  - { role:  apigee-opdk-start-components, component_name: 'edge-qpid-server', component_start_delay: 10 }
+  - { role:  apigee-opdk-start-components, component_name: 'edge-qpid-server', component_start_delay: 1 }
 
 - name: Validate that PG Master is master
   hosts: pgmaster
@@ -241,6 +241,13 @@
   - name: Setup replication standby
     shell: "{{ apigee_service }} apigee-postgresql setup-replication-on-standby -f {{ opdk_installation_config_file }}"
 
+  - name: Make sure everything is started
+    shell: "{{ apigee_all }} start"
+
+  - name: Give it time to start up
+    pause:
+      seconds: 10
+
   - name: Validate this is postgresql standby
     shell: "{{ apigee_service }} apigee-postgresql postgres-check-standby"