diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg
index 550711763f..511cca6d6f 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qadevel-stg
@@ -40,8 +40,10 @@ phabricator_filedir: /var/lib/phabricator/files
 phabricator_repodir: /var/lib/phabricator/repos
 phabricator_config_filename: qadevelconfig
 phabricator_header_color: 'fluttershy'
-phabricator_mail_enabled: False
+phabricator_mail_enabled: True
+phabricator_mail_domain: stg.fedoraproject.org
 ircnick: fedoraqabot
+
 backup_dir: /srv/backup
 backup_username: root
 backup_ssh_pubkey: ssh-dss AAAAB3NzaC1kc3MAAACBAJr3xqn/hHIXeth+NuXPu9P91FG9jozF3Q1JaGmg6szo770rrmhiSsxso/Ibm2mObqQLCyfm/qSOQRynv6tL3tQVHA6EEx0PNacnBcOV7UowR5kd4AYv82K1vQhof3YTxOMmNIOrdy6deDqIf4sLz1TDHvEDwjrxtFf8ugyZWNbTAAAAFQCS5puRZF4gpNbaWxe6gLzm3rBeewAAAIBcEd6pRatE2Qc/dW0YwwudTEaOCUnHmtYs2PHKbOPds0+Woe1aWH38NiE+CmklcUpyRsGEf3O0l5vm3VrVlnfuHpgt/a/pbzxm0U6DGm2AebtqEmaCX3CIuYzKhG5wmXqJ/z+Hc5MDj2mn2TchHqsk1O8VZM+1Ml6zX3Hl4vvBsQAAAIALDt5NFv6GLuid8eik/nn8NORd9FJPDBJxgVqHNIm08RMC6aI++fqwkBhVPFKBra5utrMKQmnKs/sOWycLYTqqcSMPdWSkdWYjBCSJ/QNpyN4laCmPWLgb3I+2zORgR0EjeV2e/46geS0MWLmeEsFwztpSj4Tv4e18L8Dsp2uB2Q==  root@backup03-rdiff-backup
@@ -56,7 +58,8 @@ buildslave_dir: /home/buildslave/slave
 buildslave_poll_interval: 1800
 master_dir: /home/buildmaster/master
 master_user: buildmaster
+
 deployment_type: qadevel-stg
-tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 222 ]
+tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}" ]
 
 freezes: false
diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2
index aff2e70baa..2344a431b1 100644
--- a/roles/phabricator/templates/local.json.j2
+++ b/roles/phabricator/templates/local.json.j2
@@ -18,9 +18,9 @@
   "diffusion.ssh-user" : "{{ phabricator_vcs_user }}",
   "welcome.html" : "{{ lookup("file", "phabricator-welcome.html") }}",
   "ui.header-color" : "{{ phabricator_header_color }}",
-  "metamta.default-address" : "phab@{{ external_hostname }}",
-  "metamta.domain" : "{{ external_hostname }}",
-  "metamta.reply-handler-domain" : "{{ external_hostname }}",
+  "metamta.default-address" : "phabricator@{{ phabricator_mail_domain }}",
+  "metamta.domain" : "{{ phabricator_mail_domain }}",
+  "metamta.reply-handler-domain" : "{{ phabricator_mail_domain }}",
   "metamta.mail-adapter" : "{{ "PhabricatorMailImplementationPHPMailerLiteAdapter" if phabricator_mail_enabled else "PhabricatorMailImplementationTestAdapter"}}",
   "auth.email-domains" : ["fedoraproject.org"],
   "phabricator.uninstalled-applications" : {