diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml
index 81eecad224..708f392203 100644
--- a/playbooks/groups/rabbitmq.yml
+++ b/playbooks/groups/rabbitmq.yml
@@ -19,7 +19,7 @@
   - base
   - rkhunter
   - nagios_client
-  - {role: zabbix/zabbix_agent, when: env == "staging"}
+  - zabbix/zabbix_agent
   - hosts
   - ipa/client
   - collectd/base
diff --git a/roles/base/templates/iptables/iptables b/roles/base/templates/iptables/iptables
index 1137be5f7c..ab4f4fe081 100644
--- a/roles/base/templates/iptables/iptables
+++ b/roles/base/templates/iptables/iptables
@@ -25,7 +25,7 @@
 -A INPUT -p tcp -m tcp --dport 5666  -s 38.145.60.15 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 5666 -s 10.3.163.10 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 5666 -s 10.3.166.10 -j ACCEPT
-# zabbix01.stg
+# zabbix01
 -A INPUT -p tcp -m tcp --dport 10051 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 10050 -s 10.3.163.198 -j ACCEPT