diff --git a/install-edge-sso.yml b/install-edge-sso.yml
index 7b4212f..88b8702 100644
--- a/install-edge-sso.yml
+++ b/install-edge-sso.yml
@@ -35,18 +35,6 @@
   vars:
     target_hosts: sso
 
-- name: Install Edge SSO
-  hosts: sso
-  gather_facts: no
-  tags: ['sso-config']
-  vars_files:
-  - ~/.apigee-secure/credentials.yml
-  - ~/.apigee/custom-properties.yml
-  roles:
-  - { role: apigee-opdk-setup-component-install, component: 'apigee-ssoadminapi' }
-  - { role: apigee-opdk-setup-edge-sso-config, tags: ['sso-config'] }
-  - { role: apigee-opdk-setup-apigee-user-ownership, tags: ['apigee-user'] }
-
 - name: Configure Apigee pre-requisites
   import_playbook: apigee-edge-configuration.yml
   tags: ['pg','pg-config','config']
@@ -59,20 +47,6 @@
   vars:
     target_hosts: sso-pg
 
-#- name: Install Postgres
-#  hosts: sso-pg
-#  gather_facts: no
-#  serial: 1
-#  tags: ['pg']
-#  vars_files:
-#  - ~/.apigee-secure/credentials.yml
-#  - ~/.apigee/custom-properties.yml
-#  roles:
-#  - { role: apigee-opdk-setup-component, profile: 'ps', opdk_installation_config_file: "{{ edge_sso_installation_config_file }}", tags: ['apigee-component'] }
-#  - { role: apigee-opdk-start-components, tags: ['apigee-component'] }
-#  - { role: apigee-opdk-server-self, server_types: ['ps'], tags: ['self']  }
-#  - { role: apigee-opdk-setup-status, tags: ['status'] }
-
 - name: Install Edge SSO
   hosts: sso-ui
   gather_facts: no
@@ -81,5 +55,9 @@
   - ~/.apigee-secure/credentials.yml
   - ~/.apigee/custom-properties.yml
   roles:
+  - { role: apigee-opdk-setup-component-install, component: 'apigee-ssoadminapi' }
+  - { role: apigee-opdk-setup-edge-sso-config, tags: ['sso-config'] }
+  - { role: apigee-opdk-setup-apigee-user-ownership, tags: ['apigee-user'] }
   - { role: apigee-opdk-setup-component, profile: 'sso', opdk_installation_config_file: "{{ edge_sso_installation_config_file }}", tags: ['sso-setup']  }
+  - { role: apigee-opdk-setup-edge-saml-config }