diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index 1572727..936deed 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -156,7 +156,6 @@ template "/opt/ejabberd/conf/ejabberd.yml" do
             hosts: hosts,
             admin_users: admin_users,
             stun_auth_realm: "kosmos.org",
-            turn_ip_address: node['ipaddress'],
             turn_min_port: node["kosmos-ejabberd"]["turn_min_port"],
             turn_max_port: node["kosmos-ejabberd"]["turn_max_port"]
   notifies :run, "execute[ejabberdctl reload_config]", :delayed
diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
index 5ed892b..f60f27f 100644
--- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
+++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
@@ -80,7 +80,7 @@ listen:
     module: ejabberd_stun
     auth_realm: <%= @stun_auth_realm %>
     use_turn: true
-    turn_ip: <%= @turn_ip_address %>
+    turn_ip: <%= node['ipaddress'] %>
     turn_min_port: <%= @turn_min_port %>
     turn_max_port: <%= @turn_max_port %>
 
@@ -223,7 +223,20 @@ modules:
     versioning: true
     store_current_id: true
   mod_shared_roster: {}
-  mod_stun_disco: {}
+  mod_stun_disco:
+   services:
+     -
+       host: <%= node['ipaddress'] %>
+       port: 3478
+       type: stun
+       transport: udp
+       restricted: false
+     -
+       host: <%= node['ipaddress'] %>
+       port: 3478
+       type: turn
+       transport: udp
+       restricted: true
   mod_vcard:
     search: false
   mod_vcard_xupdate: {}