diff --git a/components/opdk-setup-postgres-common.yml b/components/opdk-setup-postgres-common.yml
index 3a68d3e..f0258bd 100644
--- a/components/opdk-setup-postgres-common.yml
+++ b/components/opdk-setup-postgres-common.yml
@@ -15,8 +15,15 @@
     hosts: '{{ hosts }}'
     component_profile: 'ps'
 
-- 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
 
 - hosts: '{{ hosts }}'
   serial: 1