diff --git a/environments/aws/profiles/centos72-aio.yml b/environments/aws/profiles/1601-centos72-aio.yml
similarity index 100%
rename from environments/aws/profiles/centos72-aio.yml
rename to environments/aws/profiles/1601-centos72-aio.yml
diff --git a/environments/aws/profiles/centos72-dc1.yml b/environments/aws/profiles/1601-centos72-dc1.yml
similarity index 100%
rename from environments/aws/profiles/centos72-dc1.yml
rename to environments/aws/profiles/1601-centos72-dc1.yml
diff --git a/environments/aws/profiles/oraclelinux68-aio.yml b/environments/aws/profiles/1601-oraclelinux68-aio.yml
similarity index 100%
rename from environments/aws/profiles/oraclelinux68-aio.yml
rename to environments/aws/profiles/1601-oraclelinux68-aio.yml
diff --git a/environments/aws/profiles/oraclelinux68-dc1.yml b/environments/aws/profiles/1601-oraclelinux68-dc1.yml
similarity index 100%
rename from environments/aws/profiles/oraclelinux68-dc1.yml
rename to environments/aws/profiles/1601-oraclelinux68-dc1.yml
diff --git a/environments/aws/profiles/oraclelinux68-dc2.yml b/environments/aws/profiles/1601-oraclelinux68-dc2.yml
similarity index 100%
rename from environments/aws/profiles/oraclelinux68-dc2.yml
rename to environments/aws/profiles/1601-oraclelinux68-dc2.yml
diff --git a/environments/aws/profiles/oraclelinux68-dc3.yml b/environments/aws/profiles/1609-oraclelinux68-dc1.yml
similarity index 100%
rename from environments/aws/profiles/oraclelinux68-dc3.yml
rename to environments/aws/profiles/1609-oraclelinux68-dc1.yml
diff --git a/environments/aws/profiles/oraclelinux68-dc4.yml b/environments/aws/profiles/1609-oraclelinux68-dc2.yml
similarity index 100%
rename from environments/aws/profiles/oraclelinux68-dc4.yml
rename to environments/aws/profiles/1609-oraclelinux68-dc2.yml
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index b940bea..e473ad1 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -1,11 +1,13 @@
 ---
 - include: configuration/opdk-setup-os.yml
   vars:
-    hosts: 'planet'
+    hosts: 'dc-1'
+  tags:
+  - os
 
 - include: configuration/update-user.yml
   vars:
-    hosts: 'planet'
+    hosts: 'dc-1'
     user: 'root'
 
 - include: components/opdk-install-component.yml
@@ -69,6 +71,8 @@
   - org
 
 - include: validations/opdk-setup-validate.yml
+  vars:
+    hosts: 'dc-1-rmp'
   tags:
   - validate
 
diff --git a/installations/dc1/validations/opdk-setup-validate.yml b/installations/dc1/validations/opdk-setup-validate.yml
index 6d36c20..22eadf6 100644
--- a/installations/dc1/validations/opdk-setup-validate.yml
+++ b/installations/dc1/validations/opdk-setup-validate.yml
@@ -1,14 +1,16 @@
 ---
-- hosts: rmp
+- hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - opdk-setup-default-settings
   - opdk-setup-validate
   tags:
   - validate
 
-- hosts: rmp
+- hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - opdk-setup-default-settings
   - opdk-setup-validate-cleanup
   tags:
   - validate
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index 875bb2d..ca3629b 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -35,7 +35,6 @@
   vars:
     hosts: 'dc-1-ms'
     component_profile: 'ms'
-    opdk_ldap_type: '2'
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
@@ -50,7 +49,6 @@
   vars:
     hosts: 'dc-2-ms'
     component_profile: 'ms'
-    opdk_ldap_type: '2'
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
@@ -83,7 +81,6 @@
   tags:
   - qpid
 
-
 - include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgmaster'