diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index a6b494b85a..430fa4caa3 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -133,12 +133,24 @@
   tags:
   - config
 
-- name: Write wikitcms token file
+- name: Create /root/.openidc (token file location for manual runs as root)
+  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: Write wikitcms token file for fedmsg
+  copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640
+  when: "wikitcms_token is defined"
+  tags:
+  - config
+
 - name: Enable fedmsg consumer
   template: src=openqa_consumer.py.j2 dest=/etc/fedmsg.d/openqa_consumer.py owner=root group=root mode=0644
   notify:
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index b12e8868d8..dad47017f8 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -50,12 +50,24 @@
   tags:
   - config
 
-- name: Write wikitcms token file
+- name: Create /root/.openidc (token file location for manual runs as root)
+  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: Write wikitcms token file for fedmsg
+  copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640
+  when: "wikitcms_token is defined"
+  tags:
+  - config
+
 - name: Check out relvalconsumer
   git:
     repo: https://pagure.io/fedora-qa/relvalconsumer.git