diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml
index 0ea667517f..ae2be1a8fa 100644
--- a/roles/phabricator/tasks/main.yml
+++ b/roles/phabricator/tasks/main.yml
@@ -61,8 +61,9 @@
 - name: copy phabricator configuration settings
   template: src=local.json.j2 dest={{ phabroot }}/phabricator/conf/local/local.json owner=apache group=apache mode=0644
 
-- name: generate chatbot config
-  template: src=chatbot-config.json.j2 dest={{ phabroot }}/phabricator/resources/chatbot/config.json owner=apache group=apache mode=0644
+# this isn't well supported upstream right now, disabling
+#- name: generate chatbot config
+#  template: src=chatbot-config.json.j2 dest={{ phabroot }}/phabricator/resources/chatbot/config.json owner=apache group=apache mode=0644
 
 - name: upgrade phabricator storage
   command: chdir={{ phabroot }}/phabricator bin/storage upgrade --force
diff --git a/roles/phabricator/templates/chatbot-config.json.j2 b/roles/phabricator/templates/chatbot-config.json.j2
index df804284f6..18fbf3cd9f 100644
--- a/roles/phabricator/templates/chatbot-config.json.j2
+++ b/roles/phabricator/templates/chatbot-config.json.j2
@@ -1,8 +1,8 @@
 {
   "server" : "irc.freenode.net",
   "port" : 6667,
-  "nick" : "{{ircnick}}",
-  "nickpass" : "{{ircnickpass}}",
+  "nick" : "{{ ircnick }}",
+  "nickpass" : "{{ ircnickpass }}",
   "join" : [
     "#fedora-qa-devel"
   ],
@@ -15,9 +15,9 @@
     "PhabricatorBotMacroHandler"
   ],
 
-  "conduit.uri" : "https://phab.{{hostname}}/",
-  "conduit.user" : "{{ircnick}}",
-  "conduit.cert" : "{{irc_conduit_cert}}",
+  "conduit.uri" : "https://phab.{{ external_hostname }}/",
+  "conduit.user" : "{{ ircnick }}",
+  "conduit.cert" : "{{ irc_conduit_cert }}",
 
   "macro.size" : 48,
   "macro.aspect" : 0.66,
diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2
index 729e6b56f7..c869ab1bff 100644
--- a/roles/phabricator/templates/local.json.j2
+++ b/roles/phabricator/templates/local.json.j2
@@ -1,5 +1,5 @@
 {
   "load-libraries"       : [],
-  "phabricator.base-uri" : "https:\/\/phab.{{ hostname }}\/"
+  "phabricator.base-uri" : "https:\/\/phab.{{ external_hostname }}\/"
 }