diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg
index 93bc2b0d27..7cc4af437d 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qadevel-stg
@@ -20,7 +20,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
                  --network=bridge=br0,model=virtio --autostart --noautoconsole
 
 sshd_config: ssh/sshd_config.qadevel
-externalhostname: qadevel-stg.qa.fedoraproject.org
+external_hostname: qadevel-stg.qa.fedoraproject.org
 
 mariadb_host: db-qa01.qa.fedoraproject.org
 mariadb_user: '{{ qadevel_stg_mariadb_user }}'
diff --git a/roles/phabricator/templates/phabricator.conf.j2 b/roles/phabricator/templates/phabricator.conf.j2
index c9a78498ef..ca44bb3ae8 100644
--- a/roles/phabricator/templates/phabricator.conf.j2
+++ b/roles/phabricator/templates/phabricator.conf.j2
@@ -2,7 +2,7 @@ NameVirtualHost *:443
 
 <VirtualHost *:443>
   # Change this to the domain which points to your host.
-  ServerName phab.{{hostname}}
+  ServerName phab.{{external_hostname}}
 
   # Use separate log files for the SSL virtual host; note that LogLevel
   # is not inherited from httpd.conf.
@@ -72,7 +72,7 @@ NameVirtualHost *:443
 
 <VirtualHost *:80>
   # Change this to the domain which points to your host.
-  ServerName phab.{{hostname}}
+  ServerName phab.{{external_hostname}}
 
   RewriteEngine on
   RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
diff --git a/roles/phabricator/templates/qadevelconfig.conf.php.j2 b/roles/phabricator/templates/qadevelconfig.conf.php.j2
index 5667f8b344..2c977164da 100644
--- a/roles/phabricator/templates/qadevelconfig.conf.php.j2
+++ b/roles/phabricator/templates/qadevelconfig.conf.php.j2
@@ -14,9 +14,9 @@ return array(
   'diffusion.ssh-user' => '{{ phabricator_vcs_user }}',
   'welcome.html' => '{{ lookup("file", "phabricator-welcome.html") }}',
   'ui.header-color' => '{{ phabricator_header_color }}',
-  'metamta.default-address' => 'phab@{{ externalhostname }}',
-  'metamta.domain' => '{{ externalhostname }}',
-  'metamta.reply-handler-domain' => '{{ externalhostname }}',
+  'metamta.default-address' => 'phab@{{ external_hostname }}',
+  'metamta.domain' => '{{ external_hostname }}',
+  'metamta.reply-handler-domain' => '{{ external_hostname }}',
   'metamta.mail-adapter' => '{{ 'PhabricatorMailImplementationPHPMailerLiteAdapter' if phabricator_mail_enabled else 'PhabricatorMailImplementationTestAdapter'}}',
   'phabricator.uninstalled-applications' => array(
         'PhabricatorApplicationPhame' => true,