diff --git a/apigee-os-pre-requisites-postgres.yml b/apigee-os-pre-requisites-postgres.yml
index e144688..b70fd7b 100644
--- a/apigee-os-pre-requisites-postgres.yml
+++ b/apigee-os-pre-requisites-postgres.yml
@@ -8,15 +8,4 @@
   - ~/.apigee/custom-properties.yml
   roles:
   - { role: apigee-opdk-setup-os-postgres, tags: ['pg-os-pre-req'] }
-  - { role: apigee-opdk-setup-postgres-config, tags: ['pg-os-pre-req'] }
 
-- name: Update Postgres standby nodes with OS pre-requisites
-  hosts: pgstandby
-  tags: ['os-pre-req']
-  gather_facts: no
-  vars_files:
-  - ~/.apigee-secure/credentials.yml
-  - ~/.apigee/custom-properties.yml
-  roles:
-  - { role: apigee-opdk-setup-os-postgres, tags: ['pg-os-pre-req'] }
-  - { role: apigee-opdk-setup-postgres-config, tags: ['pg-os-pre-req'], clear_pgdata: True }
diff --git a/edge-pgmaster-pgstandby-node-config.yml b/edge-pgmaster-pgstandby-node-config.yml
index a5672fd..0743faf 100644
--- a/edge-pgmaster-pgstandby-node-config.yml
+++ b/edge-pgmaster-pgstandby-node-config.yml
@@ -5,6 +5,7 @@
   serial: 1
   tags: ['pg', 'pgmaster']
   roles:
+  - { role: apigee-opdk-setup-postgres-config, tags: ['pg-os-pre-req'] }
   - { role: apigee-opdk-setup-postgres-master }
   - { role: apigee-opdk-setup-status, tags: ['status'] }
 
@@ -15,5 +16,6 @@
   tags: ['pg', 'pgstandby']
   roles:
   - { role: apigee-opdk-stop-components, component_name: 'apigee-postgresql' }
+  - { role: apigee-opdk-setup-postgres-config, tags: ['pg-os-pre-req'], clear_pgdata: True }
   - { role: apigee-opdk-setup-postgres-standby }
   - { role: apigee-opdk-setup-status, tags: ['status'] }