diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml
index ada36c7c64..c1885f5d91 100644
--- a/playbooks/groups/odcs.yml
+++ b/playbooks/groups/odcs.yml
@@ -121,6 +121,8 @@
     owner_group: odcs
     host: "odcs{{env_suffix}}.fedoraproject.org"
 
+  - role: fedmsg/hub
+
   post_tasks:
   - file: src=/mnt/fedora_koji/koji dest=/mnt/koji state=link
     tags: nfs/client
diff --git a/roles/odcs/backend/tasks/main.yml b/roles/odcs/backend/tasks/main.yml
index 514255654e..3e4540da55 100644
--- a/roles/odcs/backend/tasks/main.yml
+++ b/roles/odcs/backend/tasks/main.yml
@@ -15,15 +15,6 @@
   tags:
   - odcs
   - odcs/backend
-- name: Make sure fedmsg-hub isn't running.
-  service:
-    name: fedmsg-hub
-    state: stopped
-    enabled: false
-  ignore_errors: true
-  tags:
-  - odcs
-  - odcs/backend
 - name: generate the ODCS koji config
   template:
     src: etc/koji.conf.d/odcs.conf.j2
@@ -32,7 +23,7 @@
     group: odcs
     mode: 0440
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   tags:
   - odcs
   - odcs/backend
@@ -43,7 +34,7 @@
     groups: apache
     append: true
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   tags:
   - odcs
   - odcs/backend
@@ -58,4 +49,11 @@
   tags:
   - odcs
   - odcs/backend
-
+- name: Make sure fedmsg-hub is running (we used to turn it off).
+  service:
+    name: fedmsg-hub
+    state: started
+    enabled: true
+  tags:
+  - odcs
+  - odcs/backend
diff --git a/roles/odcs/base/handlers/main.yml b/roles/odcs/base/handlers/main.yml
index 150a1c77ac..7a7a362ac6 100644
--- a/roles/odcs/base/handlers/main.yml
+++ b/roles/odcs/base/handlers/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: restart odcs-backend
-  service:
-    name: "odcs-backend"
-    state: restarted
 - name: restart fedmsg-hub
   service:
     name: fedmsg-hub
diff --git a/roles/odcs/base/tasks/main.yml b/roles/odcs/base/tasks/main.yml
index 8d02d9ea79..42b92feb1d 100644
--- a/roles/odcs/base/tasks/main.yml
+++ b/roles/odcs/base/tasks/main.yml
@@ -76,7 +76,7 @@
     group: odcs
     mode: 0440
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   when: inventory_hostname.startswith('odcs-backend')
   tags:
   - odcs
@@ -90,7 +90,7 @@
     group: odcs
     mode: 0440
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   when: inventory_hostname.startswith('odcs-backend')
   tags:
   - odcs
@@ -104,7 +104,7 @@
     group: odcs
     mode: 0440
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   when: inventory_hostname.startswith('odcs-backend')
   tags:
   - odcs
@@ -114,7 +114,7 @@
   copy: src="{{ roles_path }}/odcs/base/files/pungi.conf" dest=/etc/odcs/pungi.conf
         owner=odcs group=odcs mode=0640
   notify:
-  - restart odcs-backend
+  - restart fedmsg-hub
   when: inventory_hostname.startswith('odcs-backend')
   tags:
   - odcs