diff --git a/inventory/group_vars/badges-backend b/inventory/group_vars/badges-backend
index 9ede836ad8..6aef18c65d 100644
--- a/inventory/group_vars/badges-backend
+++ b/inventory/group_vars/badges-backend
@@ -11,7 +11,7 @@ tcp_ports: [ 3000 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/badges-backend-stg b/inventory/group_vars/badges-backend-stg
index 73084c15b3..68048f4a7d 100644
--- a/inventory/group_vars/badges-backend-stg
+++ b/inventory/group_vars/badges-backend-stg
@@ -11,7 +11,7 @@ tcp_ports: [ 3000 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/badges-web b/inventory/group_vars/badges-web
index 5c1ee28121..2013068129 100644
--- a/inventory/group_vars/badges-web
+++ b/inventory/group_vars/badges-web
@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/badges-web-stg b/inventory/group_vars/badges-web-stg
index 6c74ae8d2c..b2f4fe3316 100644
--- a/inventory/group_vars/badges-web-stg
+++ b/inventory/group_vars/badges-web-stg
@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-badges
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/nuancier b/inventory/group_vars/nuancier
index be7da40551..95d462cc57 100644
--- a/inventory/group_vars/nuancier
+++ b/inventory/group_vars/nuancier
@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-web
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/inventory/group_vars/nuancier-stg b/inventory/group_vars/nuancier-stg
index 8528ef1d1c..4cceba7e00 100644
--- a/inventory/group_vars/nuancier-stg
+++ b/inventory/group_vars/nuancier-stg
@@ -14,7 +14,7 @@ tcp_ports: [ 80, 443,
 
 fas_client_groups: sysadmin-noc,sysadmin-web
 
-# These are consumed by a task in tasks/fedmsg_base.yml
+# These are consumed by a task in roles/fedmsg_base/main.yml
 fedmsg_certs:
 - service: shell
   owner: root
diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml
index b233d5db96..f1a600fc9d 100644
--- a/playbooks/groups/badges-backend.yml
+++ b/playbooks/groups/badges-backend.yml
@@ -37,6 +37,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -46,7 +47,6 @@
   - include: $tasks/sudo.yml
   - include: $tasks/openvpn_client.yml
     when: env != "staging"
-  - include: $tasks/fedmsg_base.yml
 
   handlers:
   - include: $handlers/restart_services.yml
diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml
index f1fc0b40ce..5af4bebfee 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -38,6 +38,7 @@
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
   - /srv/web/infra/ansible/roles/badges-frontend
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -47,7 +48,6 @@
   - include: $tasks/sudo.yml
   - include: $tasks/openvpn_client.yml
     when: env != "staging"
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
   - include: $tasks/mod_wsgi.yml
 
diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml
index b25b39805b..c45edd46c7 100644
--- a/playbooks/groups/gallery.yml
+++ b/playbooks/groups/gallery.yml
@@ -37,6 +37,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -44,7 +45,6 @@
   - include: $tasks/2fa_client.yml
   - include: $tasks/motd.yml
   - include: $tasks/sudo.yml
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
 
   handlers:
diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml
index 260f4e9198..f2a1156a70 100644
--- a/playbooks/groups/keyserver.yml
+++ b/playbooks/groups/keyserver.yml
@@ -35,6 +35,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   tasks:
   - include: $tasks/hosts.yml
@@ -43,7 +44,6 @@
   - include: $tasks/openvpn_client.yml
   - include: $tasks/motd.yml
   - include: $tasks/sudo.yml
-  - include: $tasks/fedmsg_base.yml
   - include: $tasks/apache.yml
   - include: $tasks/keyserver.yml
 
diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml
index eb91b95627..37f94d233f 100644
--- a/playbooks/groups/nuancier.yml
+++ b/playbooks/groups/nuancier.yml
@@ -63,8 +63,8 @@
    - ${private}/vars.yml
    - ${vars}/${ansible_distribution}.yml
 
-  tasks:
-  - include: $tasks/fedmsg_base.yml
+  roles:
+  - /srv/web/infra/ansible/roles/fedmsg_base
 
   handlers:
   - include: $handlers/restart_services.yml
diff --git a/tasks/fedmsg_base.yml b/roles/fedmsg_base/tasks/main.yml
similarity index 93%
rename from tasks/fedmsg_base.yml
rename to roles/fedmsg_base/tasks/main.yml
index 89381c4e1b..67693e75c6 100644
--- a/tasks/fedmsg_base.yml
+++ b/roles/fedmsg_base/tasks/main.yml
@@ -15,7 +15,7 @@
   - config
 
 - name: setup basic /etc/fedmsg.d/ contents
-  template: src=$files/fedmsg/$item.j2 dest=/etc/fedmsg.d/$item owner=root group=root mode=644
+  template: src=$item.j2 dest=/etc/fedmsg.d/$item owner=root group=root mode=644
   with_items:
   - ssl.py
   - endpoints.py
diff --git a/files/fedmsg/base.py.j2 b/roles/fedmsg_base/templates/base.py.j2
similarity index 100%
rename from files/fedmsg/base.py.j2
rename to roles/fedmsg_base/templates/base.py.j2
diff --git a/files/fedmsg/endpoints-fedbadges.py.j2 b/roles/fedmsg_base/templates/endpoints-fedbadges.py.j2
similarity index 100%
rename from files/fedmsg/endpoints-fedbadges.py.j2
rename to roles/fedmsg_base/templates/endpoints-fedbadges.py.j2
diff --git a/files/fedmsg/endpoints-nuancier.py.j2 b/roles/fedmsg_base/templates/endpoints-nuancier.py.j2
similarity index 100%
rename from files/fedmsg/endpoints-nuancier.py.j2
rename to roles/fedmsg_base/templates/endpoints-nuancier.py.j2
diff --git a/files/fedmsg/endpoints.py.j2 b/roles/fedmsg_base/templates/endpoints.py.j2
similarity index 100%
rename from files/fedmsg/endpoints.py.j2
rename to roles/fedmsg_base/templates/endpoints.py.j2
diff --git a/files/fedmsg/logging.py.j2 b/roles/fedmsg_base/templates/logging.py.j2
similarity index 100%
rename from files/fedmsg/logging.py.j2
rename to roles/fedmsg_base/templates/logging.py.j2
diff --git a/files/fedmsg/pkgdb.py.j2 b/roles/fedmsg_base/templates/pkgdb.py.j2
similarity index 100%
rename from files/fedmsg/pkgdb.py.j2
rename to roles/fedmsg_base/templates/pkgdb.py.j2
diff --git a/files/fedmsg/relay.py.j2 b/roles/fedmsg_base/templates/relay.py.j2
similarity index 100%
rename from files/fedmsg/relay.py.j2
rename to roles/fedmsg_base/templates/relay.py.j2
diff --git a/files/fedmsg/ssl.py.j2 b/roles/fedmsg_base/templates/ssl.py.j2
similarity index 100%
rename from files/fedmsg/ssl.py.j2
rename to roles/fedmsg_base/templates/ssl.py.j2