diff --git a/inventory/builders b/inventory/builders
index 6c1a378f42..0a227f8ec9 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -189,6 +189,14 @@ arm04-builder21.arm.fedoraproject.org
 arm04-builder22.arm.fedoraproject.org
 arm04-builder23.arm.fedoraproject.org
 
+# These hosts get the runroot plugin installed.
+# They should be added to their own 'runroot' channel in the koji db
+# .. and they should not appear in the default channel for builds.
+[runroot]
+buildvm-01.phx2.fedoraproject.org
+buildvm-01.stg.phx2.fedoraproject.org
+
+
 [builders:children]
 buildhw
 buildvm
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 7f3a8cd207..9a8b569b04 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -114,9 +114,9 @@
   tags:
   - koji_builder
 
-- name: config for the kojid runroot plugin (only in staging)
+- name: config for the kojid runroot plugin (only some builders)
   copy: src=runroot.conf dest=/etc/kojid/runroot.conf
-  when: env == 'staging'
+  when: "'runroot' in group_names"
   notify:
   - restart kojid
   tags:
diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index 2ff47c6bd6..d0c8c7fe99 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -79,14 +79,13 @@
 # This was submitted to koji upstream, so we won't always need to install it
 # ourselves this way once it is merged and released.
 # https://lists.fedoraproject.org/pipermail/buildsys/2015-June/004780.html
-- name: koji runroot hub plugin (only staging for now)
+- name: koji runroot hub plugin
   copy: src=runroot_hub.py dest=/usr/lib/koji-hub-plugins/runroot_hub.py
   notify:
   - restart httpd
   tags:
   - config
   - koji_hub
-  when: env == 'staging'
 
 #
 # install production certs and keys