diff --git a/inventory/group_vars/pagure b/inventory/group_vars/pagure
index cb2d281323..cc3b7cc61a 100644
--- a/inventory/group_vars/pagure
+++ b/inventory/group_vars/pagure
@@ -23,6 +23,7 @@ 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: git
 
 # For the MOTD
 csi_security_category: Low
diff --git a/inventory/group_vars/pagure-stg b/inventory/group_vars/pagure-stg
index 3e4b4efd67..3d2eb3019a 100644
--- a/inventory/group_vars/pagure-stg
+++ b/inventory/group_vars/pagure-stg
@@ -24,6 +24,7 @@ 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: git
 
 # For the MOTD
 csi_security_category: Low
diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs
index a899b94283..f8a825e09d 100644
--- a/inventory/group_vars/pkgs
+++ b/inventory/group_vars/pkgs
@@ -19,6 +19,7 @@ git_port: 9418
 git_server: /usr/libexec/git-core/git-daemon
 git_server_args: --export-all --syslog --inetd --verbose
 git_basepath: /srv/git/rpms
+git_daemon_user: nobody
 
 clamscan_mailto: admin@fedoraproject.org
 clamscan_paths:
diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg
index a899b94283..37c2b70022 100644
--- a/inventory/group_vars/pkgs-stg
+++ b/inventory/group_vars/pkgs-stg
@@ -19,6 +19,7 @@ git_port: 9418
 git_server: /usr/libexec/git-core/git-daemon
 git_server_args: --export-all --syslog --inetd --verbose
 git_basepath: /srv/git/rpms
+git_daemon_user: nodoby
 
 clamscan_mailto: admin@fedoraproject.org
 clamscan_paths:
diff --git a/roles/git/server/templates/git@.service.j2 b/roles/git/server/templates/git@.service.j2
index 1209f4240b..abdc56fe5a 100644
--- a/roles/git/server/templates/git@.service.j2
+++ b/roles/git/server/templates/git@.service.j2
@@ -4,6 +4,6 @@ Documentation=man:git-daemon(1)
 Wants=git.socket
 
 [Service]
-User=nobody
+User={{ git_daemon_user }}
 ExecStart=/usr/libexec/git-core/git-daemon --base-path={{ git_basepath }} --export-all --user-path=public_git --syslog --inetd --verbose
 StandardInput=socket