diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg
index e954e1bd41..3ed75b15de 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qadevel-stg
@@ -25,6 +25,7 @@ external_hostname: qadevel-stg.qa.fedoraproject.org
 mariadb_host: db-qa01.qa.fedoraproject.org
 mariadb_user: '{{ qadevel_stg_mariadb_user }}'
 mariadb_password: '{{ qadevel_stg_mariadb_password }}'
+enable_phabricator_git: False
 phabricator_db_name: phabricator-stg
 phabricator_vcs_user: git
 phabricator_daemon_user: phabdaemon
diff --git a/inventory/inventory b/inventory/inventory
index 4e4f040e9f..13ac723ca9 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -11,7 +11,7 @@ beaker01.qa.fedoraproject.org
 qadevel.qa.fedoraproject.org
 
 [qadevel-stg]
-qadevel-stg.qa.fedoraproject.org ansible_ssh_port=222
+qadevel-stg.qa.fedoraproject.org
 
 [arm-packager]
 arm03-packager00.cloud.fedoraproject.org
diff --git a/roles/base/files/ssh/sshd_config.qadevel b/roles/base/files/ssh/sshd_config.qadevel
index 47ac9973b9..9439fa47a4 100644
--- a/roles/base/files/ssh/sshd_config.qadevel
+++ b/roles/base/files/ssh/sshd_config.qadevel
@@ -14,7 +14,7 @@
 # SELinux about this change.
 # semanage port -a -t ssh_port_t -p tcp #PORTNUMBER
 #
-Port 222
+Port 22
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml
index 83e8ca8d22..e2281ef372 100644
--- a/roles/phabricator/tasks/main.yml
+++ b/roles/phabricator/tasks/main.yml
@@ -46,6 +46,7 @@
 
 - name: create git repo root for phabricator
   file: path={{ phabricator_repodir }} state=directory owner={{ phabricator_daemon_user }} group={{ phabricator_daemon_user }} mode=1755
+  when: enable_phabricator_git
 
 - name: create file directory for phabricator
   file: path={{ phabricator_filedir }} state=directory owner=apache group=apache mode=1755
@@ -70,15 +71,19 @@
 
 - name: generate phabricator git hook
   template: src=phabricator-ssh-hook.sh.j2 dest=/etc/phabricator-ssh-hook.sh owner=root group=root mode=0755
+  when: enable_phabricator_git
 
 - name: generate phabricator ssh config for vcs
   template: src=phabricator-sshd.conf.j2 dest=/etc/ssh/phabricator-sshd.conf owner=root group=root mode=0600
+  when: enable_phabricator_git
 
 - name: generate phabricator ssh service file
   template: src=phabricator-sshd.service.j2 dest=/lib/systemd/system/phabricator-sshd.service owner=root group=root mode=0644
+  when: enable_phabricator_git
 
 - name: start and enable phabricator sshd service
   service: name=phabricator-sshd enabled=yes state=started
+  when: enable_phabricator_git
 
 - name: generate phabricator phd service file
   template: src=phd.service.j2 dest=/lib/systemd/system/phd.service owner=root group=root mode=0644