diff --git a/site-cookbooks/kosmos-dirsrv/resources/instance.rb b/site-cookbooks/kosmos-dirsrv/resources/instance.rb
index 79c5b5d..3f0d37b 100644
--- a/site-cookbooks/kosmos-dirsrv/resources/instance.rb
+++ b/site-cookbooks/kosmos-dirsrv/resources/instance.rb
@@ -163,7 +163,7 @@ done
     # Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert
     # has been generated before. The renew cron will take care of renewing
     execute "letsencrypt cert for #{new_resource.hostname}" do
-      command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@kosmos.org --webroot-path #{root_directory} --deploy-hook /etc/letsencrypt/renewal-hooks/deploy/dirsrv -d #{new_resource.hostname} -n"
+      command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@kosmos.org --webroot-path /var/www/#{new_resource.hostname} --deploy-hook /etc/letsencrypt/renewal-hooks/deploy/dirsrv -d #{new_resource.hostname} -n"
       only_if do
         ::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{new_resource.hostname}_certbot") &&
           !::File.exist?("/etc/letsencrypt/live/#{new_resource.hostname}/fullchain.pem")
diff --git a/site-cookbooks/kosmos-hubot/attributes/default.rb b/site-cookbooks/kosmos-hubot/attributes/default.rb
index 0acddb3..0cb51cf 100644
--- a/site-cookbooks/kosmos-hubot/attributes/default.rb
+++ b/site-cookbooks/kosmos-hubot/attributes/default.rb
@@ -18,6 +18,7 @@ node.default['hal8000_xmpp']['rooms'] = [
   'kosmos@kosmos.chat',
   'kosmos-dev@kosmos.chat',
   'kredits@kosmos.chat',
+  'info@kosmos.chat'
 ]
 
 node.default['hal8000_xmpp']['auth_admins'] = []
diff --git a/site-cookbooks/kosmos-mediawiki/attributes/default.rb b/site-cookbooks/kosmos-mediawiki/attributes/default.rb
index 4f58ee5..392f9dd 100644
--- a/site-cookbooks/kosmos-mediawiki/attributes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/attributes/default.rb
@@ -1,4 +1,4 @@
 node.default["mediawiki"]["url"] = "https://wiki.kosmos.org/"
-node.default["mediawiki"]["hubot_base_url"] = "http://barnard.kosmos.org:8080"
-node.default["mediawiki"]["hubot_room"] = "#kosmos"
+node.default["mediawiki"]["hubot_base_url"] = "https://hal8000.chat.kosmos.org"
+node.default["mediawiki"]["hubot_room"] = "info@kosmos.chat"
 node.default["mediawiki"]["ldap_enabled"] = true
diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
index 1f1ce8d..1024296 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -119,7 +119,7 @@ ark "MediawikiHubot" do
   action :cherry_pick
 end
 
-hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode')
+hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_xmpp')
 webhook_token = hubot_credentials['webhook_token']
 
 template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do