diff --git a/environments/aws/aws-create-default-settings.yml b/environments/aws/aws-create-default-settings.yml
index f5162d6..3676608 100644
--- a/environments/aws/aws-create-default-settings.yml
+++ b/environments/aws/aws-create-default-settings.yml
@@ -1,6 +1,4 @@
 ---
-key_name: '{{ secure_key_name }}'
-security_group: '{{ secure_security_group }}'
 vpc_subnet_id: '{{ secure_vpc_subnet_id }}'
 name_prefix: '{{ secure_name_prefix }}'
 env_name: '{{ secure_env_name }}'
@@ -10,9 +8,6 @@
 owner_contact_info: '{{ secure_owner_contact_info }}'
 team_contact_info: '{{ secure_team_contact_info }}'
 env: '{{ name_prefix }}-{{ env_name }}'
-aws_access_key: '{{ aws_access_key_id }}'
-aws_secret_key: '{{ aws_secret_access_key }}'
-aws_region: '{{ secure_aws_region }}'
 volume_type: gp2
 volume_size: 30
 delete_on_termination: true
diff --git a/environments/aws/aws_create.yml b/environments/aws/aws_create.yml
index 42dbb89..737f128 100644
--- a/environments/aws/aws_create.yml
+++ b/environments/aws/aws_create.yml
@@ -10,11 +10,11 @@
 
   - ec2_facts:
 
-  - name: "Load default provisioning settings"
-    include_vars: aws-create-default-settings.yml
-
   - name: "Load provision profile settings"
     include_vars: "profiles/{{ provision_profile }}.yml"
 
+  - name: "Load operating system"
+    include_vars: "os/{{ os_selection }}.yml"
+
   roles:
   - apigee-opdk-aws-create
diff --git a/environments/aws/os/centos72.yml b/environments/aws/os/centos72.yml
new file mode 100644
index 0000000..0897ca1
--- /dev/null
+++ b/environments/aws/os/centos72.yml
@@ -0,0 +1,3 @@
+---
+# centos 7.2
+image_id: ami-7209f41f
\ No newline at end of file
diff --git a/environments/aws/os/ol68.yml b/environments/aws/os/ol68.yml
new file mode 100644
index 0000000..2bd045e
--- /dev/null
+++ b/environments/aws/os/ol68.yml
@@ -0,0 +1,3 @@
+---
+# oraclelinux 6.8
+image_id: ami-755ba918
diff --git a/environments/aws/os/rhel72.yml b/environments/aws/os/rhel72.yml
new file mode 100644
index 0000000..abcd309
--- /dev/null
+++ b/environments/aws/os/rhel72.yml
@@ -0,0 +1,3 @@
+---
+# rhel 7.2
+image_id: ami-2051294a
diff --git a/environments/aws/profiles/1601-centos72-aio.yml b/environments/aws/profiles/1601-centos72-aio.yml
index 5b8af6e..b509bc1 100644
--- a/environments/aws/profiles/1601-centos72-aio.yml
+++ b/environments/aws/profiles/1601-centos72-aio.yml
@@ -1,6 +1,4 @@
 ---
-# centos 7.2
-image_id: ami-7209f41f
 instance_type: 't2.medium'
 wait: yes
 assign_public_ip: yes
diff --git a/environments/aws/profiles/1601-oraclelinux68-aio.yml b/environments/aws/profiles/1601-oraclelinux68-aio.yml
deleted file mode 100644
index 3e115d7..0000000
--- a/environments/aws/profiles/1601-oraclelinux68-aio.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# oraclelinux 6.8
-image_id: ami-755ba918
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: 1601-edge-ol68-aio
-application: edge
-pod: NA
-start: 1
-end: 1
\ No newline at end of file
diff --git a/environments/aws/profiles/1601-oraclelinux68-baas.yml b/environments/aws/profiles/1601-oraclelinux68-baas.yml
deleted file mode 100644
index 8f8211a..0000000
--- a/environments/aws/profiles/1601-oraclelinux68-baas.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# oraclelinux 6.8
-image_id: ami-755ba918
-instance_type: 't2.medium'
-wait: yes
-assign_public_ip: yes
-session_name: 1601-baas-oraclelinux68-1
-application: baas
-pod: NA
-start: 1
-end: 10
diff --git a/environments/aws/profiles/1601-oraclelinux68-dc1-12node.yml b/environments/aws/profiles/1601-oraclelinux68-dc1-12node.yml
index f09ba0e..e53de17 100644
--- a/environments/aws/profiles/1601-oraclelinux68-dc1-12node.yml
+++ b/environments/aws/profiles/1601-oraclelinux68-dc1-12node.yml
@@ -1,12 +1,7 @@
 ---
-# oraclelinux 6.8
-image_id: ami-755ba918
 instance_type: 't2.medium'
 wait: yes
 assign_public_ip: yes
-dc: 1
-session_name: 1601-edge-ol68-dc{{ dc }}
+session_name: "1601-edge-ol68-dc"
 application: edge
-pod: NA
-start: 1
-end: 12
\ No newline at end of file
+pod: NA
\ No newline at end of file
diff --git a/environments/aws/profiles/1601-rhel72-baas.yml b/environments/aws/profiles/1601-rhel72-baas.yml
index 43a9dba..49830f0 100644
--- a/environments/aws/profiles/1601-rhel72-baas.yml
+++ b/environments/aws/profiles/1601-rhel72-baas.yml
@@ -1,6 +1,4 @@
 ---
-# rhel 7.2
-image_id: ami-2051294a
 instance_type: 't2.medium'
 wait: yes
 assign_public_ip: yes
diff --git a/environments/aws/profiles/baas-1601.yml b/environments/aws/profiles/baas-1601.yml
new file mode 100644
index 0000000..e5f4b39
--- /dev/null
+++ b/environments/aws/profiles/baas-1601.yml
@@ -0,0 +1,7 @@
+---
+instance_type: 't2.medium'
+wait: yes
+assign_public_ip: yes
+session_name: baas-1601-dc
+application: baas
+pod: NA
diff --git a/environments/aws/profiles/control-server.yml b/environments/aws/profiles/control-server.yml
index acc7a99..ced59cd 100644
--- a/environments/aws/profiles/control-server.yml
+++ b/environments/aws/profiles/control-server.yml
@@ -1,11 +1,7 @@
 ---
-# centos 7.2
-image_id: ami-7209f41f
 instance_type: 't2.medium'
 wait: yes
 assign_public_ip: yes
-session_name: ansible-control-server
+session_name: opdk-control-server
 application: edge
-pod: NA
-start: 1
-end: 1
\ No newline at end of file
+pod: NA
\ No newline at end of file
diff --git a/environments/aws/profiles/edge-1601.yml b/environments/aws/profiles/edge-1601.yml
new file mode 100644
index 0000000..34a379a
--- /dev/null
+++ b/environments/aws/profiles/edge-1601.yml
@@ -0,0 +1,7 @@
+---
+instance_type: 't2.medium'
+wait: yes
+assign_public_ip: yes
+session_name: "edge-1601-dc"
+application: edge
+pod: NA
\ No newline at end of file