diff --git a/roles/cloudera_manager/external_account/tasks/main.yml b/roles/cloudera_manager/external_account/tasks/main.yml
index 3b092b01..fc539db2 100644
--- a/roles/cloudera_manager/external_account/tasks/main.yml
+++ b/roles/cloudera_manager/external_account/tasks/main.yml
@@ -14,6 +14,14 @@
 
 ---
 
+- name: Wait for Cloudera Manager Port to be up
+  delegate_to: "{{ groups.cloudera_manager[0] if 'cloudera_manager' in groups else 'localhost' }}"
+  ansible.builtin.wait_for:
+    port: "{{ cloudera_manager_port }}"
+    host: localhost
+    connect_timeout: 180
+    sleep: 5
+
 - name: Create Cloudera Manager external accounts
   cloudera.cluster.cm_api:
     endpoint: /externalAccounts/create
diff --git a/roles/verify/parcels_and_roles/tasks/check_cluster.yml b/roles/verify/parcels_and_roles/tasks/check_cluster.yml
index 3bf2661e..5d5cf57c 100644
--- a/roles/verify/parcels_and_roles/tasks/check_cluster.yml
+++ b/roles/verify/parcels_and_roles/tasks/check_cluster.yml
@@ -69,7 +69,7 @@
         invalid_services: >-
           {{
           cluster.services
-          | default({})
+          | reject('eq', 'AWS_S3')
           | difference(host_template_services)
           }}
     - name: Ensure that all the services are included in host templates
diff --git a/roles/verify/parcels_and_roles/tasks/check_cluster_config_roles.yml b/roles/verify/parcels_and_roles/tasks/check_cluster_config_roles.yml
index 47a3d3b2..0cb77783 100644
--- a/roles/verify/parcels_and_roles/tasks/check_cluster_config_roles.yml
+++ b/roles/verify/parcels_and_roles/tasks/check_cluster_config_roles.yml
@@ -18,11 +18,14 @@
     - set_fact:
         invalid_roles: >-
           {{ config.roles
-          | flatten
-          | map('regex_replace','/.+','')
-          | difference(['SERVICEWIDE'])
-          | difference(role_mappings[config.service] | list)
+            | flatten
+            | map('regex_replace', '/.+', '')
+            | difference(['SERVICEWIDE'])
+            | difference(role_service_mapping)
+            | list
           }}
+      vars:
+        role_service_mapping: "{{ role_mappings[config.service] | default([]) }}"
     - name: Ensure all configured roles are valid
       assert:
         that: "{{ invalid_roles | length == 0 }}"