diff --git a/installations/dc1/components/opdk-setup-postgres-standby.yml b/installations/dc1/components/opdk-setup-postgres-standby.yml
index 042a290..a8dbba2 100644
--- a/installations/dc1/components/opdk-setup-postgres-standby.yml
+++ b/installations/dc1/components/opdk-setup-postgres-standby.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: apigee-opdk-setup-boostrap-rollback, remove_apigee: true }
   - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index bb4f7b7..5646ff6 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -84,7 +84,7 @@
   vars:
     hosts: 'dc-1-ms'
   tags:
-  - org-config
+  - org
 
 - include: configuration/opdk-setup-org.yml
   vars:
diff --git a/installations/dc2/components/opdk-setup-postgres-standby.yml b/installations/dc2/components/opdk-setup-postgres-standby.yml
index 042a290..a8dbba2 100644
--- a/installations/dc2/components/opdk-setup-postgres-standby.yml
+++ b/installations/dc2/components/opdk-setup-postgres-standby.yml
@@ -2,7 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
-  - { role: apigee-opdk-setup-boostrap-rollback, remove_apigee: true }
   - apigee-opdk-setup-postgres-standby
   tags:
   - pgstandby
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index df0d166..a5e6d3e 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -146,7 +146,7 @@
     hosts: 'dc-2-ms'
     opdk_ldap_type: '2'
   tags:
-  - org-config
+  - org
 
 - include: configuration/opdk-setup-org.yml
   vars: