diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs
index 0aeb444155..12f8432e35 100644
--- a/inventory/group_vars/pkgs
+++ b/inventory/group_vars/pkgs
@@ -3,7 +3,7 @@ lvm_size: 100000
 mem_size: 4096
 num_cpus: 4
 
-tcp_ports: [ 9418, 80, 443 ]
+tcp_ports: [ 80, 443 ]
 
 # We have both celery (pagure_worker) and web thread wanting to send out fedmsg's.
 # To make things easy on the listening side (so avoid contention of binding ports), let's set the pkgs boxes to active fedmsg.
@@ -23,13 +23,6 @@ fas_client_admin_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /u
 fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran"
 admin_groups: "@sysadmin-cvs @sysadmin-releng"
 
-git_group: packager
-git_port: 9418
-git_server: /usr/libexec/git-core/git-daemon
-git_server_args: --export-all --syslog --inetd --verbose
-git_basepath: /srv/git/repositories
-git_daemon_user: nobody
-
 clamscan_mailto: admin@fedoraproject.org
 clamscan_paths:
 - /srv/cache/lookaside/pkgs
diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg
index ef8d2f53ff..7b87ca888f 100644
--- a/inventory/group_vars/pkgs-stg
+++ b/inventory/group_vars/pkgs-stg
@@ -3,7 +3,7 @@ lvm_size: 100000
 mem_size: 4096
 num_cpus: 4
 
-tcp_ports: [ 9418, 80, 443, 8444, 8443 ]
+tcp_ports: [ 80, 443, 8444, 8443 ]
 # Definining these vars has a number of effects
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
@@ -22,13 +22,6 @@ fas_client_admin_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /u
 fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran"
 admin_groups: "@sysadmin-cvs @sysadmin-releng"
 
-git_group: packager
-git_port: 9418
-git_server: /usr/libexec/git-core/git-daemon
-git_server_args: --export-all --syslog --inetd --verbose
-git_basepath: /srv/git/repositories
-git_daemon_user: nobody
-
 clamscan_mailto: admin@fedoraproject.org
 clamscan_paths:
 - /srv/cache/lookaside/pkgs
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index ea8305cd3d..5be63b3fe3 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -30,7 +30,6 @@
   - cgit/make_pkgs_list
   - gitolite/check_fedmsg_hooks
   - { role: git/make_checkout_seed, when: env != "staging" }
-  - git/server
   - git/hooks
   - git/checks
   - clamav