diff --git a/adhoc-rabbitmqqueue.yml b/adhoc-rabbitmqqueue.yml
index 3713f4a..e501a2d 100644
--- a/adhoc-rabbitmqqueue.yml
+++ b/adhoc-rabbitmqqueue.yml
@@ -18,7 +18,7 @@
 #   -> vhost: The vhost this queue will be part of. The default is /pubsub.
 
 - name: Create a User
-  hosts: all
+  hosts: '{{ host }}'
   become: false
   gather_facts: false
   vars_files:
diff --git a/adhoc-rabbitmquser.yml b/adhoc-rabbitmquser.yml
index 692911e..67770de 100644
--- a/adhoc-rabbitmquser.yml
+++ b/adhoc-rabbitmquser.yml
@@ -4,7 +4,7 @@
 # The username is the required parameter
 
 - name: Create a User
-  hosts: all
+  hosts: '{{ host }}'
   become: false
   gather_facts: false
   vars_files:
diff --git a/init-rocky-account-services.yml b/init-rocky-account-services.yml
index 01f4a39..135ad24 100644
--- a/init-rocky-account-services.yml
+++ b/init-rocky-account-services.yml
@@ -1,7 +1,7 @@
 ---
 # Preps a system to be part of Account Services
 - name: Configure Account Services
-  hosts: all
+  hosts: idp
   become: true
 
   handlers:
diff --git a/init-rocky-mantisbt.yml b/init-rocky-mantisbt.yml
index d501d4a..f68df5e 100644
--- a/init-rocky-mantisbt.yml
+++ b/init-rocky-mantisbt.yml
@@ -2,7 +2,7 @@
 # Installs the mantis bug tracker
 # This requries information from the vault
 - name: Configure MantisBT
-  hosts: all
+  hosts: bugtracker
   become: true
   vars_files:
   - vars/common.yml
diff --git a/init-rocky-noggin-theme.yml b/init-rocky-noggin-theme.yml
index 844a66d..9a5de79 100644
--- a/init-rocky-noggin-theme.yml
+++ b/init-rocky-noggin-theme.yml
@@ -1,7 +1,7 @@
 ---
 # (Re)deploys the noggin theme
 - name: Deploy Noggin Theme
-  hosts: all
+  hosts: idp
   become: true
 
   handlers:
diff --git a/init-rocky-noggin.yml b/init-rocky-noggin.yml
index 3ec54ba..396dfd3 100644
--- a/init-rocky-noggin.yml
+++ b/init-rocky-noggin.yml
@@ -1,7 +1,7 @@
 ---
 # (Re)deploys the noggin theme
 - name: Deploy Noggin
-  hosts: all
+  hosts: idp
   become: true
 
   handlers:
diff --git a/role-rocky-mirrormanager.yml b/role-rocky-mirrormanager.yml
index 20bee47..1925702 100644
--- a/role-rocky-mirrormanager.yml
+++ b/role-rocky-mirrormanager.yml
@@ -1,7 +1,7 @@
 ---
 # MirrorManager2
 - name: Install and configure mirrormanager
-  hosts: all
+  hosts: mirrormanager
   become: false
   vars_files:
     # This playbook requires vaults!
diff --git a/role-rocky-rabbitmq.yml b/role-rocky-rabbitmq.yml
index 9a89245..78320c9 100644
--- a/role-rocky-rabbitmq.yml
+++ b/role-rocky-rabbitmq.yml
@@ -1,7 +1,7 @@
 ---
 # Stands up a RabbitMQ Cluster
 - name: Configure RabbitMQ
-  hosts: all
+  hosts: rabbitmq
   become: true
   vars_files:
     # vars/vaults/encpass.yml
diff --git a/role-rocky-repopool-http.yml b/role-rocky-repopool-http.yml
index 669343f..23a9316 100644
--- a/role-rocky-repopool-http.yml
+++ b/role-rocky-repopool-http.yml
@@ -1,7 +1,7 @@
 ---
 # Preps a system to be a repository
 - name: Configure Repo Pool hosts (http)
-  hosts: all
+  hosts: repopool_http
   become: true
   vars_files:
     - vars/common.yml
diff --git a/role-rocky-repopool-rsync.yml b/role-rocky-repopool-rsync.yml
index 5c0d14d..b3332c6 100644
--- a/role-rocky-repopool-rsync.yml
+++ b/role-rocky-repopool-rsync.yml
@@ -1,7 +1,7 @@
 ---
 # Configures an instance to function as a HTTP serving member of repopool
 - name: Configure Repo Pool hosts (rsync)
-  hosts: all
+  hosts: repopool_rsync
   become: true
   vars_files:
     # vars/vaults/encpass.yml
diff --git a/role-rocky-rss-feed.yml b/role-rocky-rss-feed.yml
index 471108a..8f09ae8 100644
--- a/role-rocky-rss-feed.yml
+++ b/role-rocky-rss-feed.yml
@@ -1,7 +1,7 @@
 ---
 # Preps a system to be a repository
 - name: Configure RSS Feeds
-  hosts: all
+  hosts: srpmproc
   become: true
   vars_files:
     - vars/common.yml