diff --git a/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb b/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb
index 3401bff..44db935 100644
--- a/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb
+++ b/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb
@@ -27,7 +27,7 @@
 # Temporary extra rules for Andromeda
 
 firewall_rule 'ejabberd' do
-  port     [5222, 5269, 5280, 5443]
+  port     [5222, 5223, 5269, 5280, 5443]
   protocol :tcp
   command  :allow
 end
diff --git a/site-cookbooks/kosmos-ejabberd/metadata.rb b/site-cookbooks/kosmos-ejabberd/metadata.rb
index 51ecc0a..bbd1886 100644
--- a/site-cookbooks/kosmos-ejabberd/metadata.rb
+++ b/site-cookbooks/kosmos-ejabberd/metadata.rb
@@ -22,3 +22,4 @@ chef_version '>= 12.14' if respond_to?(:chef_version)
 depends "kosmos-postgresql"
 depends "kosmos-base"
 depends "backup"
+depends "firewall"
diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index b3070ba..2611fab 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -105,3 +105,11 @@ end
 service "ejabberd" do
   action [:enable, :start]
 end
+
+unless node.chef_environment == "development"
+  firewall_rule 'ejabberd' do
+    port     [5222, 5223, 5269, 5280, 5443]
+    protocol :tcp
+    command  :allow
+  end
+end