diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index dc62a6d683..89caecba13 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -175,13 +175,6 @@
   tags:
   - config
 
-- name: Wipe the old fedmsg consumer config file
-  file: path=/etc/fedmsg.d/checkcomp_consumer.py state=absent
-  notify:
-  - restart fedmsg-hub
-  tags:
-  - config
-
 - name: Install config file
   template: src=check-compose.conf.j2 dest=/etc/check-compose.conf mode=0644
   tags:
diff --git a/roles/openqa/dispatcher/defaults/main.yml b/roles/openqa/dispatcher/defaults/main.yml
index 093d929e08..2b424defa8 100644
--- a/roles/openqa/dispatcher/defaults/main.yml
+++ b/roles/openqa/dispatcher/defaults/main.yml
@@ -1,5 +1,4 @@
 openqa_hostname: localhost
-openqa_consumer: true
 openqa_extraarches: false
 openqa_amqp_passive: false
 openqa_amqp_scheduler_url: "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index e19439a34b..60ec781a5d 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -3,10 +3,6 @@
 ##      string - hostname of openQA server to run jobs for and query
 ##               job results from
 ##      default - localhost
-# - openqa_consumer
-##      bool - whether to enable the fedmsg consumer and run whenever
-##             a compose completes
-##      default - true
 # - external_hostname
 ##      string - The public hostname of the openQA server (used in
 ##               links back from ResultsDB and wiki results)
@@ -232,8 +228,12 @@
   notify:
   - restart openqa scheduler consumer
 
+# FIXME: we should probably have the fedora-messaging consumers run as
+# someone other than root and then we'd need another token file for
+# them, as we used to have for the fedmsg user. But for now they run
+# as root and use this one.
 - name: openQA client config
-  template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=root group=fedmsg mode=0640
+  template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=root group=root mode=0640
   tags:
   - config
 
@@ -252,25 +252,19 @@
   tags:
   - config
 
-- name: Create /root/.openidc (token file location for manual runs as root)
+# FIXME: we should probably have the fedora-messaging consumers run as
+# someone other than root and then we'd need another token file for
+# them, as we used to have for the fedmsg user. But for now they run
+# as root and use this one.
+- name: Create /root/.openidc (wiki access token file location)
   file: path=/root/.openidc state=directory owner=root group=root mode=0700
 
-- name: Create /usr/share/fedmsg/.openidc (token file location for fedmsg consumer runs)
-  file: path=/usr/share/fedmsg/.openidc state=directory owner=root group=fedmsg mode=0750
-
 - name: Write wikitcms token file for root
   copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600
   when: "wikitcms_token is defined"
   tags:
   - config
 
-- name: Wipe the old fedmsg consumer config file
-  file: path=/etc/fedmsg.d/openqa_consumer.py state=absent
-  notify:
-  - restart fedmsg-hub
-  tags:
-  - config
-
 - name: Create /etc/pki/fedora-messaging
   file:
     dest: /etc/pki/fedora-messaging
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 3a62fa7032..36f447bd17 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -94,7 +94,7 @@
 # stable and testing
 - name: Install openQA packages
   package:
-    name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedmsg', 'openqa-plugin-fedoraupdaterestart',
+    name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedora-messaging', 'openqa-plugin-fedoraupdaterestart',
            'python3-fedfind']
     state: present
 #    enablerepo: "updates-testing"
@@ -265,9 +265,10 @@
   pause: seconds=5
   when: "services is defined and services is changed"
 
-# the 'dispatcher' role requires this to be root.fedmsg 0640. so we
-# don't enforce ownership here and set mode to 0640 so we don't wind
-# up ping-ponging it between server and dispatcher roles.
+# the 'dispatcher' role may require this to have a non-root group and
+# sets it 0640, so we don't enforce ownership here and set mode to
+# 0640 so we don't wind up ping-ponging it between server and
+# dispatcher roles.
 - name: openQA client config
   template: src=client.conf.j2 dest=/etc/openqa/client.conf mode=0640
   tags:
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index 43eeb52a7d..19d8695089 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -220,13 +220,6 @@
   tags:
   - config
 
-- name: Wipe the old fedmsg consumer config file
-  file: path=/etc/fedmsg.d/relvalconsumer.py state=absent
-  notify:
-  - restart fedmsg-hub
-  tags:
-  - config
-
 - name: Enable and start fedora-messaging relvalconsumer
   service: name=fm-consumer@relvalconsumer enabled=yes state=started
   when: not relvalconsumer_disabled|bool