diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ce6cb0e76..092a3a2bcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -361,6 +361,13 @@ fdroid build:
     # make sure .gradle stores inside $CI_PROJECT_DIR to make it cacheable
     - ln -s $home_vagrant/.gradle $CI_PROJECT_DIR/.gradle
 
+    # Set up git config something like the production buildserver. The
+    # difference is that in production, this is installed on the
+    # buildserver VM host, while here it is basically in the
+    # buildserver VM.
+    # https://gitlab.com/fdroid/fdroid-bootstrap-buildserver/-/merge_requests/30
+    - curl --silent 'https://gitlab.com/fdroid/fdroid-bootstrap-buildserver/-/raw/master/roles/production_hardening/files/gitconfig' >> $home_vagrant/.gitconfig
+
     - for d in logs tmp unsigned $home_vagrant/build $home_vagrant/.android $home_vagrant/.gradle $ANDROID_HOME; do
           test -d $d || mkdir $d;
           chown -R vagrant $d;