diff --git a/roles/cloudera_manager/external_auth/tasks/main.yml b/roles/cloudera_manager/external_auth/tasks/main.yml
index 2a3ecf6d..9e44aa8c 100644
--- a/roles/cloudera_manager/external_auth/tasks/main.yml
+++ b/roles/cloudera_manager/external_auth/tasks/main.yml
@@ -21,7 +21,7 @@
 
 - name: Set Cloudera Manager external auth configs
   include_role:
-    name: cloudera_manager/config
+    name: cloudera.cluster.cloudera_manager.config
   vars:
     api_config_keys_uppercase: True
     api_configs: "{{ lookup('template', 'external_auth_configs.j2') | from_yaml }}"
diff --git a/roles/config/cluster/base/templates/configs/logdirs-7.1.0.j2 b/roles/config/cluster/base/templates/configs/logdirs-7.1.0.j2
index ce841ede..077fe350 100644
--- a/roles/config/cluster/base/templates/configs/logdirs-7.1.0.j2
+++ b/roles/config/cluster/base/templates/configs/logdirs-7.1.0.j2
@@ -5,6 +5,8 @@ ATLAS:
     log_dir: "{{ log_base }}/atlas"
     ranger_atlas_plugin_hdfs_audit_spool_directory: "{{ log_base }}/atlas/audit/hdfs/spool"
     ranger_atlas_plugin_solr_audit_spool_directory: "{{ log_base }}/atlas/audit/solr/spool"
+  GATEWAY:
+    log_dir: "{{ log_base }}/atlas"
 CORE_SETTINGS:
   STORAGEOPERATIONS:
     storageoperations_log_dir: "{{ log_base }}/"
diff --git a/roles/config/cluster/kts/tasks/main.yml b/roles/config/cluster/kts/tasks/main.yml
index 32462dd1..b7ff1bdb 100644
--- a/roles/config/cluster/kts/tasks/main.yml
+++ b/roles/config/cluster/kts/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Retrieve repository metadata
   include_role:
-    name: deployment/repometa
+    name: cloudera.cluster.deployment.repometa
   vars:
     repositories: "{{ cluster.repositories | default({}) }}"
 
diff --git a/roles/deployment/cluster/tasks/create_base.yml b/roles/deployment/cluster/tasks/create_base.yml
index b476c026..ac080232 100644
--- a/roles/deployment/cluster/tasks/create_base.yml
+++ b/roles/deployment/cluster/tasks/create_base.yml
@@ -16,11 +16,11 @@
 
 - name: Generate complete base cluster configs
   include_role:
-    name: config/cluster/base
+    name: cloudera.cluster.config.cluster.base
 
 - name: Create databases and users
   include_role:
-    name: deployment/databases
+    name: cloudera.cluster.deployment.databases
   vars:
     services: "{{ cluster.services | default({}) }}"
 
diff --git a/roles/deployment/cluster/tasks/create_kts.yml b/roles/deployment/cluster/tasks/create_kts.yml
index dea39fc4..e2e0303e 100644
--- a/roles/deployment/cluster/tasks/create_kts.yml
+++ b/roles/deployment/cluster/tasks/create_kts.yml
@@ -16,7 +16,7 @@
 
 - name: Generate complete kts cluster configs
   include_role:
-    name: config/cluster/kts
+    name: cloudera.cluster.config.cluster.kts
 
 - name: Generate cluster template file
   template:
diff --git a/roles/deployment/cluster/tasks/main.yml b/roles/deployment/cluster/tasks/main.yml
index 87d4d41e..a5c45f06 100644
--- a/roles/deployment/cluster/tasks/main.yml
+++ b/roles/deployment/cluster/tasks/main.yml
@@ -20,7 +20,7 @@
 
 - name: Apply "all hosts" configs
   include_role:
-    name: cloudera_manager/config
+    name: cloudera.cluster.cloudera_manager.config
   vars:
     api_config_keys_uppercase: False
     api_config_endpoint: cm/allHosts/config
diff --git a/roles/deployment/repometa/templates/role_mappings/cdh7.j2 b/roles/deployment/repometa/templates/role_mappings/cdh7.j2
index 0b82adb4..62493847 100644
--- a/roles/deployment/repometa/templates/role_mappings/cdh7.j2
+++ b/roles/deployment/repometa/templates/role_mappings/cdh7.j2
@@ -1,6 +1,7 @@
 ADLS_CONNECTOR:
 ATLAS:
   - ATLAS_SERVER
+  - GATEWAY
 AWS_S3:
 CORE_SETTINGS:
   - GATEWAY
@@ -29,7 +30,6 @@ HDFS:
 HIVE:
   - GATEWAY
   - HIVEMETASTORE
-  - HIVESERVER2
 HIVE_ON_TEZ:
   - GATEWAY
   - HIVESERVER2
diff --git a/roles/deployment/services/kms/tasks/create_kms.yml b/roles/deployment/services/kms/tasks/create_kms.yml
index e6b07f80..372a7f0c 100644
--- a/roles/deployment/services/kms/tasks/create_kms.yml
+++ b/roles/deployment/services/kms/tasks/create_kms.yml
@@ -75,7 +75,7 @@
 
 - name: Generate KMS configs
   include_role:
-    name: config/services/kms
+    name: cloudera.cluster.config.services.kms
 
 - name: Create KMS service
   cloudera.cluster.cm_api:
diff --git a/roles/teardown/tasks/main.yml b/roles/teardown/tasks/main.yml
index c636ce11..695fe6cf 100644
--- a/roles/teardown/tasks/main.yml
+++ b/roles/teardown/tasks/main.yml
@@ -77,7 +77,7 @@
 
 - name: Remove Clusters from Cloudera Manager (compute)
   include_role:
-    name: operations/delete_cluster
+    name: cloudera.cluster.operations.delete_cluster
   vars:
     stop_cluster_before_delete: true
     cluster: "{{ default_cluster_compute | combine(_cluster) }}"
@@ -95,7 +95,7 @@
 
 - name: Remove Clusters from Cloudera Manager (base)
   include_role:
-    name: operations/delete_cluster
+    name: cloudera.cluster.operations.delete_cluster
   vars:
     stop_cluster_before_delete: true
     cluster: "{{ default_cluster_base | combine(_cluster) }}"
@@ -113,7 +113,7 @@
 
 - name: Remove Clusters from Cloudera Manager (kts)
   include_role:
-    name: operations/delete_cluster
+    name: cloudera.cluster.operations.delete_cluster
   vars:
     stop_cluster_before_delete: true
     cluster: "{{ default_cluster_kts | combine(_cluster) }}"
@@ -132,7 +132,7 @@
 # delete the cms from cm if we are not tearing cm down
 - name: Remove CMS from Cloudera Manager
   import_role:
-    name: operations/delete_cms
+    name: cloudera.cluster.operations.delete_cms
   vars:
     stop_cms_before_delete: true
   run_once: true
diff --git a/roles/teardown/tasks/teardown_cdsw.yml b/roles/teardown/tasks/teardown_cdsw.yml
index f5044b0a..e5eb7e52 100644
--- a/roles/teardown/tasks/teardown_cdsw.yml
+++ b/roles/teardown/tasks/teardown_cdsw.yml
@@ -16,7 +16,7 @@
 
 - name: Generate merged configs (base)
   include_role:
-    name: config/cluster/base
+    name: cloudera.cluster.config.cluster.base
 
 - name: Stop the CDSW node
   shell: /opt/cloudera/parcels/CDSW/scripts/cdsw-stop-node.sh
diff --git a/roles/teardown/tasks/teardown_cluster.yml b/roles/teardown/tasks/teardown_cluster.yml
index 6b1c2047..6ab5b189 100644
--- a/roles/teardown/tasks/teardown_cluster.yml
+++ b/roles/teardown/tasks/teardown_cluster.yml
@@ -16,12 +16,12 @@
 
 - name: Generate merged configs (base, compute)
   include_role:
-    name: config/cluster/base
+    name: cloudera.cluster.config.cluster.base
   when: cluster.type | default('base') in ['base', 'compute']
 
 - name: Generate merged configs (kts)
   include_role:
-    name: config/cluster/kts
+    name: cloudera.cluster.config.cluster.kts
   when: cluster.type | default('base') == 'kts'
 
 - name: Remove cluster service directories (base, compute)
diff --git a/roles/teardown/tasks/teardown_cms.yml b/roles/teardown/tasks/teardown_cms.yml
index cf0a4591..f2a80044 100644
--- a/roles/teardown/tasks/teardown_cms.yml
+++ b/roles/teardown/tasks/teardown_cms.yml
@@ -16,7 +16,7 @@
 
 - name: Generate merged configs
   include_role:
-    name: config/services/mgmt
+    name: cloudera.cluster.config.services.mgmt
 
 - name: Delete service database
   include_tasks: teardown_database.yml
diff --git a/roles/verify/definition/tasks/main.yml b/roles/verify/definition/tasks/main.yml
index 98b2cef0..5a3b92b7 100644
--- a/roles/verify/definition/tasks/main.yml
+++ b/roles/verify/definition/tasks/main.yml
@@ -249,6 +249,15 @@
         - "'zookeeper_tls_keystore' not in zookeeper_servicewide_configs"
         - "'zookeeper_tls_keystore' not in zookeeper_servicewide_configs"
 
+## Passwords
+- block:
+    - name: Ensure that the admin password is not part of the hostname(s)
+      assert:
+        that: groups.cluster is not search(cloudera_manager_admin_password)
+        success_msg: "The CM admin password is not part of the hostname"
+        fail_msg: "The CM admin password must not be part of the hostname"
+      when: cloudera_manager_admin_password is defined
+
 # Version specific
 
 # Add version specific issues here (e.g. Database versions)
diff --git a/roles/verify/parcels_and_roles/tasks/check_cluster.yml b/roles/verify/parcels_and_roles/tasks/check_cluster.yml
index c397054f..6bff0b24 100644
--- a/roles/verify/parcels_and_roles/tasks/check_cluster.yml
+++ b/roles/verify/parcels_and_roles/tasks/check_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Retrieve repository metadata
   include_role:
-    name: deployment/repometa
+    name: cloudera.cluster.deployment.repometa
   vars:
     repositories: "{{ cluster.repositories | default({}) }}"