diff --git a/.automation/test/ansible/playbooks/ansible_good_1.yml b/.automation/test/ansible/playbooks/ansible_good_1.yml
index 7fb77604..45627122 100644
--- a/.automation/test/ansible/playbooks/ansible_good_1.yml
+++ b/.automation/test/ansible/playbooks/ansible_good_1.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: github_primary
+- name: Configure the GHE Instance
+  hosts: github_primary
   vars:
     demo_github_initial_user: "{{ hostvars['localhost'].local_user }}"
     github_host: "{{ hostvars['github_primary'].ansible_host }}"
diff --git a/.automation/test/ansible/roles/ghe_initialize/handlers/main.yml b/.automation/test/ansible/roles/ghe_initialize/handlers/main.yml
index 9df0bf67..2481a214 100644
--- a/.automation/test/ansible/roles/ghe_initialize/handlers/main.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/handlers/main.yml
@@ -8,7 +8,7 @@
 ####################
 # GHE config apply #
 ####################
-- name: ghe config apply
+- name: GHE Config Apply
   ansible.builtin.command: ghe-config-apply
   poll: 0
   async: 300
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/collectd-settings.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/collectd-settings.yml
index 9bd9605a..15802ae5 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/collectd-settings.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/collectd-settings.yml
@@ -1,5 +1,14 @@
 ---
 - name: Wait for admin port to open
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - metrics
+    - github
+    - ghe_primary
+    - initialize
+
   block:
   - name: Wait for Admin port to come up (Port 8443)
     ## Doc: http://docs.ansible.com/ansible/latest/modules/wait_for_module.html
@@ -77,12 +86,3 @@
     ansible.builtin.service:
       name: collectd
       state: restarted
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - metrics
-    - github
-    - ghe_primary
-    - initialize
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-api-config-apply.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-api-config-apply.yml
index 43f4f32c..001eec9f 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-api-config-apply.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-api-config-apply.yml
@@ -1,5 +1,12 @@
 ---
 - name: GHE API Configuration
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - github
+    - ghe_primary
+    - initialize
   block:
   # ##################################
   # # Run config to take in settings #
@@ -59,11 +66,3 @@
       - "/tmp/ghe-license.ghl"
       - "/tmp/settings.json"
       - "/tmp/ldap-settings.json"
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - github
-    - ghe_primary
-    - initialize
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-config-apply.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-config-apply.yml
index 3f1b9c27..36f7a3f8 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-config-apply.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-config-apply.yml
@@ -1,5 +1,13 @@
 ---
 - name: GHE Config apply
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - github
+    - ghe_primary
+    - initialize
+
   block:
   ########################################
   # Copy the script to the local machine #
@@ -23,11 +31,3 @@
     poll: 0
     args:
       executable: "/bin/bash"
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - github
-    - ghe_primary
-    - initialize
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-initial-configuration.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-initial-configuration.yml
index 719e27bc..a0c40103 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-initial-configuration.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-initial-configuration.yml
@@ -1,5 +1,13 @@
 ---
 - name: GHE Initial configuration
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - github
+    - ghe_primary
+    - initialize
+
   block:
   ###############################
   # Wait for admin port to open #
@@ -78,11 +86,3 @@
   - name: Set the GitHub Admin password fact
     ansible.builtin.set_fact:
       github_admin_password: "{{ github_admin_password }}"
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - github
-    - ghe_primary
-    - initialize
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-ldap-configuration.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-ldap-configuration.yml
index cd1d4ed5..6a993706 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-ldap-configuration.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/ghe-ldap-configuration.yml
@@ -1,5 +1,10 @@
 ---
 - name: GHE LDAP configuration
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - openldap
   block:
   #######################################################
   # Copy License file to GHE to decrypt file and upload #
@@ -24,9 +29,3 @@
     delay: 2
     register: http_ldapconfig_result
     until: http_ldapconfig_result.rc == 0
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - openldap
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/main.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/main.yml
index faa4c226..ce1f66d7 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/main.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/main.yml
@@ -1,34 +1,34 @@
 ---
 - name: Configure the GHE Instance
+  tags:
+    - github
+    - ghe_primary
+    - initialize
   block:
     ######################################################
     # Need to run the tasks to stand up the GHE instance #
     ######################################################
     # Configure the base system
     - ansible.builtin.include_tasks: ghe-initial-configuration.yml
-  tags:
-    - github
-    - ghe_primary
-    - initialize
 
 - name: Configure the GHE LDAP
+  tags:
+    - openldap
   block:
     ############################################################
     # Need to run the tasks to config LDAP on the GHE instance #
     ############################################################
     # Configure the base system
     - ansible.builtin.include_tasks: ghe-ldap-configuration.yml
-  tags:
-    - openldap
 
 - name: Configure the GHE Instance Block
+  tags:
+    - github
+    - ghe_primary
+    - initialize
   block:
     ######################################################
     # Need to run the tasks to stand up the GHE instance #
     ######################################################
     # Configure the base system
     - ansible.builtin.include_tasks: ghe-api-config-apply.yml
-  tags:
-    - github
-    - ghe_primary
-    - initialize
diff --git a/.automation/test/ansible/roles/ghe_initialize/tasks/splunk-settings.yml b/.automation/test/ansible/roles/ghe_initialize/tasks/splunk-settings.yml
index ccac6e80..939e75db 100644
--- a/.automation/test/ansible/roles/ghe_initialize/tasks/splunk-settings.yml
+++ b/.automation/test/ansible/roles/ghe_initialize/tasks/splunk-settings.yml
@@ -1,5 +1,13 @@
 ---
 - name: Splunk settings
+  ######################
+  # Set the tags block #
+  ######################
+  tags:
+    - splunk
+    - github
+    - ghe_primary
+    - initialize
   block:
   ###############################
   # Wait for admin port to open #
@@ -57,12 +65,3 @@
     register: http_splunk_config_result
     until: http_splunk_config_result.rc == 0
     notify: ghe config apply
-
-  ######################
-  # Set the tags block #
-  ######################
-  tags:
-    - splunk
-    - github
-    - ghe_primary
-    - initialize