diff --git a/server-ce/init_scripts/01_nginx_config_template.sh b/server-ce/init_scripts/01_nginx_config_template.sh
index 84f39ea637..1a9d40d502 100755
--- a/server-ce/init_scripts/01_nginx_config_template.sh
+++ b/server-ce/init_scripts/01_nginx_config_template.sh
@@ -17,15 +17,20 @@ nginx_template_file="${nginx_templates_dir}/nginx.conf.template"
 nginx_config_file="${nginx_dir}/nginx.conf"
 
 if [ -f "${nginx_template_file}" ]; then
-  export NGINX_WORKER_PROCESSES="${NGINX_WORKER_PROCESSES:-4}"
+  export NGINX_KEEPALIVE_TIMEOUT="${NGINX_KEEPALIVE_TIMEOUT:-65}"
   export NGINX_WORKER_CONNECTIONS="${NGINX_WORKER_CONNECTIONS:-768}"
+  export NGINX_WORKER_PROCESSES="${NGINX_WORKER_PROCESSES:-4}"
 
   echo "Nginx: generating config file from template"
 
   # Note the single-quotes, they are important.
   # This is a pass-list of env-vars that envsubst
   # should operate on.
-  envsubst '${NGINX_WORKER_PROCESSES} ${NGINX_WORKER_CONNECTIONS}' \
+  envsubst '
+    ${NGINX_KEEPALIVE_TIMEOUT}
+    ${NGINX_WORKER_CONNECTIONS}
+    ${NGINX_WORKER_PROCESSES}
+  ' \
     < "${nginx_template_file}" \
     > "${nginx_config_file}"
 
diff --git a/server-ce/nginx/nginx.conf.template b/server-ce/nginx/nginx.conf.template
index 663ca21c81..639937f41c 100644
--- a/server-ce/nginx/nginx.conf.template
+++ b/server-ce/nginx/nginx.conf.template
@@ -21,7 +21,7 @@ http {
 	sendfile on;
 	tcp_nopush on;
 	tcp_nodelay on;
-	keepalive_timeout 65;
+	keepalive_timeout ${NGINX_KEEPALIVE_TIMEOUT};
 	types_hash_max_size 2048;
 	# server_tokens off;