diff --git a/environments/aws/profiles/oraclelinux68-dc2.yml b/environments/aws/profiles/oraclelinux68-dc2.yml
new file mode 100644
index 0000000..2cb2eb9
--- /dev/null
+++ b/environments/aws/profiles/oraclelinux68-dc2.yml
@@ -0,0 +1,11 @@
+---
+# oraclelinux 6.8
+image_id: ami-755ba918
+instance_type: 't2.medium'
+wait: yes
+assign_public_ip: yes
+session_name: 1601-edge-ol68-dc2
+application: edge
+pod: NA
+start: 1
+end: 9
\ No newline at end of file
diff --git a/environments/aws/profiles/oraclelinux68-dc3.yml b/environments/aws/profiles/oraclelinux68-dc3.yml
new file mode 100644
index 0000000..a04043e
--- /dev/null
+++ b/environments/aws/profiles/oraclelinux68-dc3.yml
@@ -0,0 +1,11 @@
+---
+# oraclelinux 6.8
+image_id: ami-755ba918
+instance_type: 't2.medium'
+wait: yes
+assign_public_ip: yes
+session_name: 1609-edge-ol68-dc1
+application: edge
+pod: NA
+start: 1
+end: 9
\ No newline at end of file
diff --git a/environments/aws/profiles/oraclelinux68-dc4.yml b/environments/aws/profiles/oraclelinux68-dc4.yml
new file mode 100644
index 0000000..8a4dc66
--- /dev/null
+++ b/environments/aws/profiles/oraclelinux68-dc4.yml
@@ -0,0 +1,11 @@
+---
+# oraclelinux 6.8
+image_id: ami-755ba918
+instance_type: 't2.medium'
+wait: yes
+assign_public_ip: yes
+session_name: 1609-edge-ol68-dc2
+application: edge
+pod: NA
+start: 1
+end: 9
\ No newline at end of file
diff --git a/environments/aws/requirements.yml b/environments/aws/requirements.yml
new file mode 100644
index 0000000..5f7e116
--- /dev/null
+++ b/environments/aws/requirements.yml
@@ -0,0 +1,7 @@
+---
+- src: https://github.com/carlosfrias/apigee-opdk-aws-create
+  name: aws-create
+
+- src: https://github.com/carlosfrias/apigee-opdk-aws-terminate
+  name: aws-terminate
+
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
index 913b7a9..18c98c1 100644
--- a/installations/aio/installation.yml
+++ b/installations/aio/installation.yml
@@ -1,4 +1,13 @@
 ---
+- hosts: 'planet'
+  tasks:
+  - name: Update cache with basic node info
+    setup:
+
+  - name: Update cache with AWS info, if running on aws
+    ec2_facts:
+    when: ansible_bios_version is defined and ansible_bios_version | lower | search('amazon')
+
 - include: configuration/opdk-setup-os.yml
   vars:
     hosts: 'planet'
diff --git a/requirements.yml b/installations/aio/requirements.yml
similarity index 92%
copy from requirements.yml
copy to installations/aio/requirements.yml
index a7635c2..195bb59 100644
--- a/requirements.yml
+++ b/installations/aio/requirements.yml
@@ -76,9 +76,3 @@
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
   name: opdk-setup-bootstrap-rollback
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
-  name: opdk-cassandra-rebuild
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
-  name: opdk-cassandra-client-update
diff --git a/requirements.yml b/installations/dc1/requirements.yml
similarity index 88%
copy from requirements.yml
copy to installations/dc1/requirements.yml
index a7635c2..86e85d0 100644
--- a/requirements.yml
+++ b/installations/dc1/requirements.yml
@@ -56,9 +56,6 @@
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
-- src: https://github.com/carlosfrias/apigee-opdk-enable-swap
-  name: opdk-enable-swap
-
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
   name: opdk-setup-postgres-config
 
@@ -76,9 +73,3 @@
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
   name: opdk-setup-bootstrap-rollback
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild
-  name: opdk-cassandra-rebuild
-
-- src: https://github.com/carlosfrias/apigee-opdk-cassandra-client-update
-  name: opdk-cassandra-client-update
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index d0274f7..4570949 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -1,12 +1,4 @@
 ---
-#- hosts: 'planet'
-#  become: yes
-#  gather_facts: no
-#  strategy: free
-#  tasks:
-#  - name: Load credentials from encrypted file
-#    include_vars: '~/.apigee/credentials.yml'
-
 - include: configuration/opdk-setup-os.yml
   vars:
     hosts: 'planet'
@@ -20,6 +12,8 @@
   vars:
     hosts: 'dc-2-ds'
     component_profile: 'ds'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - ds
 
@@ -27,28 +21,38 @@
   vars:
     hosts: 'dc-1-ds'
     component_profile: 'ds'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - ds
 
 - include: components/opdk-cassandra-client-update.yml
   vars:
      hosts: 'dc-1-ms'
+     jdk_version: '1.8'
 
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-1-ms'
     component_profile: 'ms'
+    opdk_ldap_type: '2'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - ms
 
 - include: components/opdk-cassandra-rebuild.yml
   vars:
     hosts: 'dc-2-ds'
+    jdk_version: '1.8'
 
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-2-ms'
     component_profile: 'ms'
+    opdk_ldap_type: '2'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - ms2
 
@@ -56,6 +60,8 @@
   vars:
     hosts: 'dc-2-rmp'
     component_profile: 'rmp'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - rmp
 
@@ -63,6 +69,8 @@
   vars:
     hosts: 'dc-1-rmp'
     component_profile: 'rmp'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - rmp
 
@@ -70,30 +78,53 @@
   vars:
     hosts: 'dc-2-qpid'
     component_profile: 'qs'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - qpid
 
-- include: components/opdk-setup-postgres-master.yml
+
+- include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgmaster'
+    pg_component: 'master'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - pgmaster
 
-- include: components/opdk-setup-postgres-standby.yml
+- include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgstandby'
+    pg_component: 'standby'
+    jdk_version: '1.8'
+    opdk_ldap_type: '2'
   tags:
   - pgstandby
 
+#- include: components/opdk-setup-postgres-master.yml
+#  vars:
+#    hosts: 'dc-2-pgmaster'
+#  tags:
+#  - pgmaster
+#
+#- include: components/opdk-setup-postgres-standby.yml
+#  vars:
+#    hosts: 'dc-2-pgstandby'
+#  tags:
+#  - pgstandby
+
 - include: configuration/opdk-setup-org-config.yml
   vars:
     hosts: 'dc-2-ms'
+    opdk_ldap_type: '2'
   tags:
   - org-config
 
 - include: configuration/opdk-setup-org.yml
   vars:
     hosts: 'dc-2-ms'
+    opdk_ldap_type: '2'
   tags:
   - org
 
diff --git a/requirements.yml b/installations/dc2/requirements.yml
similarity index 96%
rename from requirements.yml
rename to installations/dc2/requirements.yml
index a7635c2..8a0e908 100644
--- a/requirements.yml
+++ b/installations/dc2/requirements.yml
@@ -56,9 +56,6 @@
 - src: https://github.com/carlosfrias/apigee-fetch-files
   name: fetch-files
 
-- src: https://github.com/carlosfrias/apigee-opdk-enable-swap
-  name: opdk-enable-swap
-
 - src: https://github.com/carlosfrias/apigee-opdk-setup-postgres-config
   name: opdk-setup-postgres-config