diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/arm-releng.yml
index 6ed2b844aa..288b77cc42 100644
--- a/playbooks/groups/arm-releng.yml
+++ b/playbooks/groups/arm-releng.yml
@@ -19,13 +19,13 @@
   - denyhosts
   - nagios_client
   - sudo
+  - releng
 
   tasks:
   # this is how you include other task lists
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/common_scripts.yml"
-  - include: "{{ tasks }}/koji/releng_config.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml
index ae0c05e096..827e693dd2 100644
--- a/playbooks/groups/composers.yml
+++ b/playbooks/groups/composers.yml
@@ -39,10 +39,10 @@
   - collectd/base
   - hosts
   - builder_repo
+  - releng
   - fedmsg/base
 
   tasks:
-  - include: "{{ tasks }}/koji/releng_config.yml"
   - include: "{{ tasks }}/motd.yml"
 
   handlers:
diff --git a/tasks/koji/releng_config.yml b/roles/releng/tasks/main.yml
similarity index 100%
rename from tasks/koji/releng_config.yml
rename to roles/releng/tasks/main.yml