diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2811fe..677b342 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,21 +28,15 @@ stages:
 
 
 ### BEGIN TEMPLATES ###
-.tags_template: &tags_template
+.centos_header_template: &centos_header
   tags:
     - zen-ci
-
-
-.header_template: &header
-  variables:
-    DOCKER_IMG_TAG: "7.8.2003"
+  only:
+    - master
 
 
 .check_versions_template: &check_vers
-  <<: *tags_template
   stage: check_and_lint
-  only:
-    - master
   script:
     - /usr/bin/hostname
     - "cd ${CI_PROJECT_DIR} && git log -1"
@@ -51,20 +45,14 @@ stages:
 
 
 .lint_play_template: &lint_play
-  <<: *tags_template
   stage: check_and_lint
-  only:
-    - master
   script:
     - chmod 755 ${ANSIBLE_PLAY_PATH}
     - ansible-lint -v ${ANSIBLE_PLAY_PATH}/*.yml
 
 
 .test_deploy_template: &test_deploy
-  <<: *tags_template
   stage: test_deploy
-  only:
-    - master
   script:
     - chmod 755 ${ANSIBLE_PLAY_PATH}
     - pwd
@@ -76,17 +64,17 @@ stages:
 
 
 ### BEGIN JOBS ###
-Version Checks:
-  <<: *header
+Version Checks - CentOS:
+  <<: *centos_header
   <<: *check_vers
 
 
-Lint Play:
-  <<: *header
+Lint Play - CentOS:
+  <<: *centos_header
   <<: *lint_play
 
 
-Test Deploy:
-  <<: *header
+Test Deploy - CentOS:
+  <<: *centos_header
   <<: *test_deploy
 ### END JOBS ###
diff --git a/ansible.cfg b/ansible.cfg
index 7a0beae..fd767f1 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,19 +1,20 @@
 [defaults]
-inventory = /home/chris/git/ansible/inventory/hosts
-roles_path = /etc/ansible/roles
-remote_tmp = /tmp/.ansible-${USER}/tmp
-gathering = smart
-gather_timeout = 30
-fact_caching = jsonfile
-fact_caching_connection = facts.d
-fact_caching_timeout = 1800
-retry_files_enabled = False
-forks = 8
-timeout = 30
-host_key_checking = False
-display_skipped_hosts = False
+inventory               = /etc/ansible/hosts
+roles_path              = /etc/ansible/roles
+remote_tmp              = /tmp/.ansible-${USER}/tmp
+gathering               = smart
+gather_timeout          = 30
+fact_path               = /etc/ansible/facts.d
+fact_caching            = jsonfile
+fact_caching_connection = /etc/ansible/facts.d
+fact_caching_timeout    = 1800
+retry_files_enabled     = False
+forks                   = 15
+timeout                 = 30
+host_key_checking       = False
+display_skipped_hosts   = False
+interpreter_python      = auto_silent
 # ansible_python_interpreter=/usr/bin/python3
-interpreter_python=auto_silent
 
 
 [ssh_connection]
diff --git a/host_vars/10.1.1.193.yml b/host_vars/10.1.1.193.yml
index 594df6e..6be730a 100644
--- a/host_vars/10.1.1.193.yml
+++ b/host_vars/10.1.1.193.yml
@@ -108,8 +108,8 @@
       mac_address: "20:d1:60:ec:44:07"
       ip_address : "10.1.1.218"
 
-    spacewalk:
-      mac_address: "A6:74:37:B9:54:EF"
+    rhel:
+      mac_address: "16:8D:09:6D:AD:89"
       ip_address : "10.1.1.130"
 
     er4: