diff --git a/inventory/group_vars/freshmaker-stg b/inventory/group_vars/freshmaker-stg
index 76c0217980..21cf20127c 100644
--- a/inventory/group_vars/freshmaker-stg
+++ b/inventory/group_vars/freshmaker-stg
@@ -2,6 +2,7 @@
 # For app config
 freshmaker_messaging_topic_prefix:
 - org.fedoraproject.stg
+- org.fedoraproject.prod
 
 freshmaker_parsers:
 - freshmaker.parsers.git:GitReceiveParser
diff --git a/roles/freshmaker/base/handlers/main.yml b/roles/freshmaker/base/handlers/main.yml
new file mode 100644
index 0000000000..a536a3b7a7
--- /dev/null
+++ b/roles/freshmaker/base/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart fedmsg-hub daemon
+  command: /usr/local/bin/conditional-restart.sh fedmsg-hub python2-fedmsg
diff --git a/roles/freshmaker/base/tasks/main.yml b/roles/freshmaker/base/tasks/main.yml
index 3b669fbced..0493b360be 100644
--- a/roles/freshmaker/base/tasks/main.yml
+++ b/roles/freshmaker/base/tasks/main.yml
@@ -34,6 +34,6 @@
     mode: 0440
   notify:
   - restart apache
-  - restart fedmsg-hub
+  - restart fedmsg-hub daemon
   tags:
   - freshmaker