diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index ee339fb..e2ef8ef 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -27,8 +27,13 @@
   tags:
   - apigee-component
 
-- include: 'opdk-setup-postgres-{{ pg_component }}.yml'
-  when: pg_component is defined
+- include: 'opdk-setup-postgres-master.yml'
+  when: pg_component is defined and pg_component == 'master'
+  tags:
+  - apigee-component
+
+- include: 'opdk-setup-postgres-standby.yml'
+  when: pg_component is defined and pg_component == 'standby'
   tags:
   - apigee-component