diff --git a/roles/fedimg/tasks/main.yml b/roles/fedimg/tasks/main.yml
index f36ec72d79..5ceacbabcb 100644
--- a/roles/fedimg/tasks/main.yml
+++ b/roles/fedimg/tasks/main.yml
@@ -17,7 +17,6 @@
   package: name={{ item }} state=present
   with_items:
   - euca2ools
-  when: env == "staging"
   tags:
   - fedimg
 
@@ -44,7 +43,6 @@
       owner=fedmsg group=fedmsg mode=0700
   notify:
   - restart fedmsg-hub
-  when: env == "staging"
   tags:
   - fedimg
 
diff --git a/roles/fedimg/templates/fedmsg.d/fedimg.py b/roles/fedimg/templates/fedmsg.d/fedimg.py
index f3aa4dac56..25401cd5d3 100644
--- a/roles/fedimg/templates/fedmsg.d/fedimg.py
+++ b/roles/fedimg/templates/fedmsg.d/fedimg.py
@@ -29,6 +29,8 @@ config = {
 }
 {% else %}
 config = {
-    'fedimgconsumer': True,
+    'fedimgconsumer.dev.enabled': False,
+    'fedimgconsumer.prod.enabled': True,
+    'fedimgconsumer.stg.enabled': False,
 }
 {% endif %}