diff --git a/README.md b/README.md
index 118cd0b7..fc8bb4b7 100644
--- a/README.md
+++ b/README.md
@@ -927,6 +927,7 @@ Below is the complete list of available options that can be used to customize yo
 - **RACK_ATTACK_MAXRETRY**: Number of failed auth attempts before which an IP should be banned. Defaults to `10`
 - **RACK_ATTACK_FINDTIME**: Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`.
 - **RACK_ATTACK_BANTIME**: Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`.
+- **GITLAB_WORKHORSE_TIMEOUT**: Timeout for gitlab workhorse http proxy. Defaults to `5m0s`.
 
 # Maintenance
 
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 8608ba69..bbbb4301 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -253,6 +253,7 @@ command=/usr/local/bin/gitlab-workhorse
   -authBackend http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
   -authSocket ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket
   -documentRoot ${GITLAB_INSTALL_DIR}/public
+  -proxyHeadersTimeout {{GITLAB_WORKHORSE_TIMEOUT}}
 user=git
 autostart=true
 autorestart=true
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 46e536ba..afc593f4 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -90,6 +90,8 @@ if [[ -z ${GITLAB_MAX_OBJECT_SIZE} ]]; then
   fi
 fi
 
+GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}
+
 ## ARTIFACTS
 GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true}
 GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 40ab928b..67fe358d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -267,7 +267,9 @@ gitlab_configure_redis() {
 
 gitlab_configure_gitlab_workhorse() {
   echo "Configuring gitlab::gitlab-workhorse..."
-  update_template /etc/supervisor/conf.d/gitlab-workhorse.conf GITLAB_RELATIVE_URL_ROOT
+  update_template /etc/supervisor/conf.d/gitlab-workhorse.conf \
+    GITLAB_RELATIVE_URL_ROOT \
+    GITLAB_WORKHORSE_TIMEOUT
 }
 
 gitlab_configure_unicorn() {