diff --git a/Changelog.md b/Changelog.md
index 58080ee0..9ca9ff87 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,12 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v14.8.4
 - gitaly: upgrade to v14.8.4
 
+**14.8.3**
+- gitlab: upgrade CE to v14.8.3
+- gitaly: upgrade to v14.8.3
+- golang: upgrade to v1.17.8
+- ubuntu: upgrade to focal-20220316
+
 **14.8.2**
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
diff --git a/Dockerfile b/Dockerfile
index 93f88858..bf026c06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:focal-20220113
+FROM ubuntu:focal-20220316
 
 ARG VERSION=14.8.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.7 \
+    GOLANG_VERSION=1.17.8 \
     GITLAB_SHELL_VERSION=13.23.2 \
     GITLAB_PAGES_VERSION=1.54.0 \
     GITALY_SERVER_VERSION=14.8.4 \
diff --git a/README.md b/README.md
index 2557a605..66d90a41 100644
--- a/README.md
+++ b/README.md
@@ -1001,6 +1001,7 @@ Below is the complete list of available options that can be used to customize yo
 | `NGINX_X_FORWARDED_PROTO` | Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. |
 | `NGINX_REAL_IP_RECURSIVE` | set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. |
 | `NGINX_REAL_IP_TRUSTED_ADDRESSES` | You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. |
+| `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` | Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. |
 | `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` |
 | `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. |
 | `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. |
diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index b08c8bff..c2e22a29 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -94,4 +94,5 @@ server {
     internal;
   }
 
+  {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}}
 }
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 7e7be7bf..893232b7 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -139,4 +139,6 @@ server {
     root {{GITLAB_INSTALL_DIR}}/public;
     internal;
   }
+
+  {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}}
 }
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 8015ec1c..661219a3 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -312,6 +312,7 @@ case ${GITLAB_HTTPS} in
   true) NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-https} ;;
   *)    NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-\$scheme} ;;
 esac
+NGINX_CUSTOM_GITLAB_SERVER_CONFIG=${NGINX_CUSTOM_GITLAB_SERVER_CONFIG:-}
 
 ## MAIL DELIVERY
 SMTP_DOMAIN=${SMTP_DOMAIN:-www.gmail.com}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8d1ca5ec..b42936df 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1329,7 +1329,8 @@ nginx_configure_gitlab() {
     GITLAB_PORT \
     NGINX_PROXY_BUFFERING \
     NGINX_ACCEL_BUFFERING \
-    NGINX_X_FORWARDED_PROTO
+    NGINX_X_FORWARDED_PROTO \
+    NGINX_CUSTOM_GITLAB_SERVER_CONFIG
 
   nginx_configure_gitlab_ssl
   nginx_configure_gitlab_hsts