diff --git a/.circleci/config.yml b/.circleci/config.yml
index 747df192c..b23690010 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  shellcheck: circleci/shellcheck@3.2.0
-  docker: circleci/docker@2.8.1
+  shellcheck: circleci/shellcheck@3.4.0
+  docker: circleci/docker@2.8.2
   go: circleci/go@1.11.0
 
 commands:
diff --git a/Changelog.md b/Changelog.md
index f827b48d7..f6dc204e7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,16 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**17.11.2**
+## 18.0.0
+
+- gitlab: upgrade CE to v18.0.0
+- gitaly: upgrade to v18.0.0
+- gitlab-pages: upgrade to v18.0.0
+- redis: upgrade to v7
+- rubygems: upgrade to v3.6.9
+- ubuntu: upgrade to noble-20250415.1
+
+## 17.11.2
 
 - gitlab: upgrade CE to v17.11.2
 - gitaly: upgrade to v17.11.2
@@ -11,27 +20,27 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.3
 - ubuntu: upgrade to jammy-20250415.1
 
-**17.11.1**
+## 17.11.1
 
 - gitlab: upgrade CE to v17.11.1
 - gitaly: upgrade to v17.11.1
 - gitlab-pages: upgrade to v17.11.1
 - rubygems: upgrade to v3.6.8
 
-**17.11.0**
+## 17.11.0
 
 - gitlab: upgrade CE to v17.11.0
 - gitaly: upgrade to v17.11.0
 - gitlab-pages: upgrade to v17.11.0
 
-**17.10.4**
+## 17.10.4
 
 - gitlab: upgrade CE to v17.10.4
 - gitaly: upgrade to v17.10.4
 - gitlab-pages: upgrade to v17.10.4
 - ubuntu: upgrade to jammy-20250404
 
-**17.10.3**
+## 17.10.3
 
 - gitlab: upgrade CE to v17.10.3
 - gitaly: upgrade to v17.10.3
@@ -39,13 +48,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.2
 - ruby: upgrade to v3.2.8
 
-**17.10.1**
+## 17.10.1
 
 - gitlab: upgrade CE to v17.10.1
 - gitaly: upgrade to v17.10.1
 - gitlab-pages: upgrade to v17.10.1
 
-**17.10.0**
+## 17.10.0
 
 - gitlab: upgrade CE to v17.10.0
 - gitaly: upgrade to v17.10.0
@@ -53,19 +62,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.1
 - rubygems: upgrade to v3.6.6
 
-**17.9.2**
+## 17.9.2
 
 - gitlab: upgrade CE to v17.9.2
 - gitaly: upgrade to v17.9.2
 - gitlab-pages: upgrade to v17.9.2
 
-**17.9.1**
+## 17.9.1
 
 - gitlab: upgrade CE to v17.9.1
 - gitaly: upgrade to v17.9.1
 - gitlab-pages: upgrade to v17.9.1
 
-**17.9.0**
+## 17.9.0
 
 - gitlab: upgrade CE to v17.9.0
 - gitaly: upgrade to v17.9.0
@@ -75,7 +84,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - rubygems: upgrade to v3.5.23
 - ubuntu: upgrade to jammy-20250126
 
-**17.8.2**
+## 17.8.2
 
 - gitlab: upgrade CE to v17.8.2
 - gitaly: upgrade to v17.8.2
@@ -83,25 +92,25 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.6
 - ruby: upgrade to v3.2.7
 
-**17.8.1**
+## 17.8.1
 
 - gitlab: upgrade CE to v17.8.1
 - gitaly: upgrade to v17.8.1
 - gitlab-pages: upgrade to v17.8.1
 
-**17.8.0**
+## 17.8.0
 
 - gitlab: upgrade CE to v17.8.0
 - gitaly: upgrade to v17.8.0
 - gitlab-pages: upgrade to v17.8.0
 
-**17.7.1**
+## 17.7.1
 
 - gitlab: upgrade CE to v17.7.1
 - gitaly: upgrade to v17.7.1
 - gitlab-pages: upgrade to v17.7.1
 
-**17.7.0**
+## 17.7.0
 
 - gitlab: upgrade CE to v17.7.0
 - gitaly: upgrade to v17.7.0
@@ -109,32 +118,32 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to jammy-20240911.1
 - update healthcheck for postgresql
 
-**17.6.3**
+## 17.6.3
 
 - gitlab: upgrade CE to v17.6.3
 - gitaly: upgrade to v17.6.3
 - gitlab-pages: upgrade to v17.6.3
 
-**17.6.2**
+## 17.6.2
 
 - gitlab: upgrade CE to v17.6.2
 - gitaly: upgrade to v17.6.2
 - gitlab-pages: upgrade to v17.6.2
 
-**17.6.1**
+## 17.6.1
 
 - gitlab: upgrade CE to v17.6.1
 - gitlab-pages: upgrade to v17.6.1
 - gitaly: upgrade to v17.6.1
 - golang: upgrade to v1.23.5
 
-**17.6.0**
+## 17.6.0
 
 - gitlab: upgrade CE to v17.6.0
 - gitaly: upgrade to v17.6.0
 - gitlab-pages: upgrade to v17.6.0
 
-**17.5.2**
+## 17.5.2
 
 - gitlab: upgrade CE to v17.5.2
 - gitaly: upgrade to v17.5.2
@@ -142,20 +151,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.2
 - ruby: upgrade to v3.2.6
 
-**17.5.1**
+## 17.5.1
 
 - gitlab: upgrade CE to v17.5.1
 - gitaly: upgrade to v17.5.1
 - gitlab-pages: upgrade to v17.5.1
 
-**17.5.0**
+## 17.5.0
 
 - gitlab: upgrade CE to v17.5.0
 - gitaly: upgrade to v17.5.0
 - gitlab-pages: upgrade to v17.5.0
 - ubuntu: upgrade to focal-20241011
 
-**17.4.2**
+## 17.4.2
 
 - gitlab: upgrade CE to v17.4.2
 - gitaly: upgrade to v17.4.2
@@ -163,39 +172,39 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.2
 - ubuntu: upgrade to focal-20240918
 
-**17.4.1**
+## 17.4.1
 
 - gitlab: upgrade CE to v17.4.1
 - gitaly: upgrade to v17.4.1
 - gitlab-pages: upgrade to v17.4.1
 
-**17.4.0**
+## 17.4.0
 
 - gitlab: upgrade CE to v17.4.0
 - gitaly: upgrade to v17.4.0
 - gitlab-pages: upgrade to v17.4.0
 - gitlab-shell: upgrade to v14.39.0
 
-**17.3.3**
+## 17.3.3
 
 - gitlab: upgrade CE to v17.3.3
 - gitaly: upgrade to v17.3.3
 - gitlab-pages: upgrade to v17.3.3
 
-**17.3.2**
+## 17.3.2
 
 - gitlab: upgrade CE to v17.3.2
 - gitaly: upgrade to v17.3.2
 - gitlab-pages: upgrade to v17.3.2
 - golang: upgrade to v1.23.1
 
-**17.3.1**
+## 17.3.1
 
 - gitlab: upgrade CE to v17.3.1
 - gitaly: upgrade to v17.3.1
 - gitlab-pages: upgrade to v17.3.1
 
-**17.3.0**
+## 17.3.0
 
 - gitlab: upgrade CE to v17.3.0
 - gitaly: upgrade to v17.3.0
@@ -203,48 +212,48 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.38.0
 - golang: upgrade to v1.23.0
 
-**17.2.2**
+## 17.2.2
 
 - gitlab: upgrade CE to v17.2.2
 - gitaly: upgrade to v17.2.2
 - gitlab-pages: upgrade to v17.2.2
 - golang: upgrade to v1.22.6
 
-**17.2.1**
+## 17.2.1
 
 - gitlab: upgrade CE to v17.2.1
 - gitaly: upgrade to v17.2.1
 - gitlab-pages: upgrade to v17.2.1
 - ruby: upgrade to v3.2.5
 
-**17.2.0**
+## 17.2.0
 
 - gitlab: upgrade CE to v17.2.0
 - gitaly: upgrade to v17.2.0
 - gitlab-pages: upgrade to v17.2.0
 - gitlab-shell: upgrade to v14.37.0
 
-**17.1.2**
+## 17.1.2
 
 - gitlab: upgrade CE to v17.1.2
 - gitaly: upgrade to v17.1.2
 - gitlab-pages: upgrade to v17.1.2
 - golang: upgrade to v1.22.5
 
-**17.1.1**
+## 17.1.1
 
 - gitlab: upgrade CE to v17.1.1
 - gitaly: upgrade to v17.1.1
 - gitlab-pages: upgrade to v17.1.1
 
-**17.1.0**
+## 17.1.0
 
 - gitlab: upgrade CE to v17.1.0
 - gitaly: upgrade to v17.1.0
 - gitlab-pages: upgrade to v17.1.0
 - gitlab-shell: upgrade to v14.36.0
 
-**17.0.2**
+## 17.0.2
 
 - gitlab: upgrade CE to v17.0.2
 - gitaly: upgrade to v17.0.2
@@ -252,20 +261,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.4
 - ubuntu: upgrade to focal-20240530
 
-**17.0.1**
+## 17.0.1
 
 - gitlab: upgrade CE to v17.0.1
 - gitaly: upgrade to v17.0.1
 - gitlab-pages: upgrade to v17.0.1
 
-**17.0.0**
+## 17.0.0
 
 - gitlab: upgrade CE to v17.0.0
 - gitaly: upgrade to v17.0.0
 - gitlab-pages: upgrade to v17.0.0
 - gitlab-shell: upgrade to v14.35.0
 
-**16.11.2**
+## 16.11.2
 
 - gitlab: upgrade CE to v16.11.2
 - gitaly: upgrade to v16.11.2
@@ -273,7 +282,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.3
 - ubuntu: upgrade to focal-20240427
 
-**16.11.1**
+## 16.11.1
 
 - gitlab: upgrade CE to v16.11.1
 - gitaly: upgrade to v16.11.1
@@ -281,41 +290,41 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v3.2.4
 - ubuntu: upgrade to focal-20240416
 
-**16.11.0**
+## 16.11.0
 
 - gitlab: upgrade CE to v16.11.0
 - gitaly: upgrade to v16.11.0
 - gitlab-pages: upgrade to v16.11.0
 - gitlab-shell: upgrade to v14.35.0
 
-**16.10.3**
+## 16.10.3
 
 - gitlab: upgrade CE to v16.10.3
 - gitaly: upgrade to v16.10.3
 - gitlab-pages: upgrade to v16.10.3
 - ubuntu: upgrade to focal-20240410
 
-**16.10.2**
+## 16.10.2
 
 - gitlab: upgrade CE to v16.10.2
 - gitaly: upgrade to v16.10.2
 - gitlab-pages: upgrade to v16.10.2
 - golang: upgrade to v1.22.2
 
-**16.10.1**
+## 16.10.1
 
 - gitlab: upgrade CE to v16.10.1
 - gitaly: upgrade to v16.10.1
 - gitlab-pages: upgrade to v16.10.1
 
-**16.10.0**
+## 16.10.0
 
 - gitlab: upgrade CE to v16.10.0
 - gitaly: upgrade to v16.10.0
 - gitlab-pages: upgrade to v16.10.0
 - gitlab-shell: upgrade to v14.34.0
 
-**16.9.2**
+## 16.9.2
 
 - gitlab: upgrade CE to v16.9.2
 - gitaly: upgrade to v16.9.2
@@ -323,19 +332,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.1
 - ubuntu: upgrade to focal-20240216
 
-**16.9.1**
+## 16.9.1
 
 - gitlab: upgrade CE to v16.9.1
 - gitaly: upgrade to v16.9.1
 - gitlab-pages: upgrade to v16.9.1
 
-**16.9.0**
+## 16.9.0
 
 - gitlab: upgrade CE to v16.9.0
 - gitaly: upgrade to v16.9.0
 - gitlab-pages: upgrade to v16.9.0
 
-**16.8.2**
+## 16.8.2
 
 - gitlab: upgrade CE to v16.8.2
 - gitaly: upgrade to v16.8.2
@@ -343,33 +352,33 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.0
 - ubuntu: upgrade to focal-20240123
 
-**16.8.1**
+## 16.8.1
 
 - gitlab: upgrade CE to v16.8.1
 - gitaly: upgrade to v16.8.1
 - gitlab-pages: upgrade to v16.8.1
 - gitlab-shell: upgrade to v14.33.0
 
-**16.8.0**
+## 16.8.0
 
 - gitlab: upgrade CE to v16.8.0
 - gitaly: upgrade to v16.8.0
 - gitlab-pages: upgrade to v16.8.0
 
-**16.7.3**
+## 16.7.3
 
 - gitlab: upgrade CE to v16.7.3
 - gitaly: upgrade to v16.7.3
 - gitlab-pages: upgrade to v16.7.3
 
-**16.7.2**
+## 16.7.2
 
 - gitlab: upgrade CE to v16.7.2
 - gitaly: upgrade to v16.7.2
 - gitlab-pages: upgrade to v16.7.2
 - golang: upgrade to v1.21.6
 
-**16.7.0**
+## 16.7.0
 
 - gitlab: upgrade CE to v16.7.0
 - gitaly: upgrade to v16.7.0
@@ -377,7 +386,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.32.0
 - ruby: upgrade to v3.1.4
 
-**16.6.2**
+## 16.6.2
 
 - gitlab: upgrade CE to v16.6.2
 - gitaly: upgrade to v16.6.2
@@ -385,14 +394,14 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.21.5
 - ubuntu: upgrade to focal-20231211
 
-**16.6.1**
+## 16.6.1
 
 - gitlab: upgrade CE to v16.6.1
 - gitaly: upgrade to v16.6.1
 - gitlab-pages: upgrade to v16.6.1
 - ubuntu: upgrade to focal-20231128
 
-**16.6.0**
+## 16.6.0
 
 - gitlab: upgrade CE to v16.6.0
 - gitaly: upgrade to v16.6.0
@@ -400,13 +409,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.30.0
 - golang: upgrade to v1.21.4
 
-**16.5.1**
+## 16.5.1
 
 - gitlab: upgrade CE to v16.5.1
 - gitaly: upgrade to v16.5.1
 - gitlab-pages: upgrade to v16.5.1
 
-**16.5.0**
+## 16.5.0
 
 - gitlab: upgrade CE to v16.5.0
 - gitaly: upgrade to v16.5.0
@@ -415,64 +424,64 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.21.3
 - ubuntu: upgrade to focal-20231003
 
-**16.4.1**
+## 16.4.1
 
 - gitlab: upgrade CE to v16.4.1
 - gitaly: upgrade to v16.4.1
 - gitlab-pages: upgrade to v16.4.1
 
-**16.4.0**
+## 16.4.0
 
 - gitlab: upgrade CE to v16.4.0
 - gitaly: upgrade to v16.4.0
 - gitlab-pages: upgrade to v16.4.0
 - gitlab-shell: upgrade to v14.28.0
 
-**16.3.4**
+## 16.3.4
 
 - gitlab: upgrade CE to v16.3.4
 - gitaly: upgrade to v16.3.4
 - gitlab-pages: upgrade to v16.3.4
 
-**16.3.3**
+## 16.3.3
 
 - gitlab: upgrade CE to v16.3.3
 - gitaly: upgrade to v16.3.3
 - gitlab-pages: upgrade to v16.3.3
 
-**16.3.2**
+## 16.3.2
 
 - gitlab: upgrade CE to v16.3.2
 - gitaly: upgrade to v16.3.2
 - gitlab-pages: upgrade to v16.3.2
 - golang: upgrade to v1.21.1
 
-**16.3.1**
+## 16.3.1
 
 - gitlab: upgrade CE to v16.3.1
 - gitaly: upgrade to v16.3.1
 - gitlab-pages: upgrade to v16.3.1
 
-**16.3.0**
+## 16.3.0
 
 - gitlab: upgrade CE to v16.3.0
 - gitaly: upgrade to v16.3.0
 - gitlab-pages: upgrade to v16.3.0
 
-**16.2.4**
+## 16.2.4
 
 - gitlab: upgrade CE to v16.2.4
 - gitaly: upgrade to v16.2.4
 - gitlab-pages: upgrade to v16.2.4
 - golang: upgrade to v1.21.0
 
-**16.2.3**
+## 16.2.3
 
 - gitlab: upgrade CE to v16.2.3
 - gitaly: upgrade to v16.2.3
 - gitlab-pages: upgrade to v16.2.3
 
-**16.2.2**
+## 16.2.2
 
 - gitlab: upgrade CE to v16.2.2
 - gitaly: upgrade to v16.2.2
@@ -480,131 +489,131 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.20.7
 - ubuntu: upgrade to focal-20230801
 
-**16.2.1**
+## 16.2.1
 
 - gitlab: upgrade CE to v16.2.1
 - gitaly: upgrade to v16.2.1
 - gitlab-pages: upgrade to v16.2.1
 
-**16.2.0**
+## 16.2.0
 
 - gitlab: upgrade CE to v16.2.0
 - gitaly: upgrade to v16.2.0
 - gitlab-pages: upgrade to v16.2.0
 - golang: upgrade to v1.20.6
 
-**16.1.2**
+## 16.1.2
 
 - gitlab: upgrade CE to v16.1.2
 - gitaly: upgrade to v16.1.2
 - gitlab-pages: upgrade to v16.1.2
 - ubuntu: upgrade to focal-20230624
 
-**16.1.1**
+## 16.1.1
 
 - gitlab: upgrade CE to v16.1.1
 - gitaly: upgrade to v16.1.1
 - gitlab-pages: upgrade to v16.1.1
 
-**16.1.0**
+## 16.1.0
 
 - gitlab: upgrade CE to v16.1.0
 - gitaly: upgrade to v16.1.0
 - gitlab-pages: upgrade to v16.1.0
 - gitlab-shell: upgrade to v14.23.0
 
-**16.0.5**
+## 16.0.5
 
 - gitlab: upgrade CE to v16.0.5
 - gitaly: upgrade to v16.0.5
 - gitlab-pages: upgrade to v16.0.5
 - ubuntu: upgrade to focal-20230605
 
-**16.0.4**
+## 16.0.4
 
 - gitlab: upgrade CE to v16.0.4
 - gitaly: upgrade to v16.0.4
 - gitlab-pages: upgrade to v16.0.4
 
-**16.0.3**
+## 16.0.3
 
 - gitlab: upgrade CE to v16.0.3
 - gitaly: upgrade to v16.0.3
 - gitlab-pages: upgrade to v16.0.3
 
-**16.0.2**
+## 16.0.2
 
 - gitlab: upgrade CE to v16.0.2
 - gitaly: upgrade to v16.0.2
 - gitlab-pages: upgrade to v16.0.2
 - golang: upgrade to v1.20.5
 
-**16.0.1**
+## 16.0.1
 
 - gitlab: upgrade CE to v16.0.1
 - gitaly: upgrade to v16.0.1
 - gitlab-pages: upgrade to v16.0.1
 
-**16.0.0**
+## 16.0.0
 
 - gitlab: upgrade CE to v16.0.0
 - gitaly: upgrade to v16.0.0
 - gitlab-pages: upgrade to v16.0.0
 - gitlab-shell: upgrade to v14.20.0
 
-**15.11.5**
+## 15.11.5
 
 - gitlab: upgrade CE to v15.11.5
 - gitaly: upgrade to v15.11.5
 - gitlab-pages: upgrade to v15.11.5
 
-**15.11.4**
+## 15.11.4
 
 - gitlab: upgrade CE to v15.11.4
 - gitaly: upgrade to v15.11.4
 - gitlab-pages: upgrade to v15.11.4
 
-**15.11.3**
+## 15.11.3
 
 - gitlab: upgrade CE to v15.11.3
 - gitaly: upgrade to v15.11.3
 - gitlab-pages: upgrade to v15.11.3
 - ruby: upgrade to v3.0.6
 
-**15.11.2**
+## 15.11.2
 
 - gitlab: upgrade CE to v15.11.2
 - gitaly: upgrade to v15.11.2
 - gitlab-pages: upgrade to v15.11.2
 
-**15.11.1**
+## 15.11.1
 
 - gitlab: upgrade CE to v15.11.1
 - gitaly: upgrade to v15.11.1
 - gitlab-pages: upgrade to v15.11.1
 - golang: upgrade to v1.20.4
 
-**15.11.0**
+## 15.11.0
 
 - gitlab: upgrade CE to v15.11.0
 - gitaly: upgrade to v15.11.0
 - gitlab-pages: upgrade to v15.11.0
 - ubuntu: upgrade to focal-20230412
 
-**15.10.3**
+## 15.10.3
 
 - gitlab: upgrade CE to v15.10.3
 - gitaly: upgrade to v15.10.3
 - gitlab-pages: upgrade to v15.10.3
 
-**15.10.2**
+## 15.10.2
 
 - gitlab: upgrade CE to v15.10.2
 - gitaly: upgrade to v15.10.2
 - gitlab-pages: upgrade to v15.10.2
 - golang: upgrade to v1.20.3
 
-**15.10.1**
+## 15.10.1
 
 - gitlab: upgrade CE to v15.10.1
 - gitaly: upgrade to v15.10.1
@@ -612,7 +621,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v2.7.8
 - ubuntu: upgrade to focal-20230308
 
-**15.10.0**
+## 15.10.0
 
 - gitlab: upgrade CE to v15.10.0
 - gitaly: upgrade to v15.10.0
@@ -620,52 +629,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.18.0
 - ubuntu: upgrade to focal-20230308
 
-**15.9.3**
+## 15.9.3
 
 - gitlab: upgrade CE to v15.9.3
 - gitaly: upgrade to v15.9.3
 - gitlab-pages: upgrade to v15.9.3
 - golang: upgrade to v1.20.2
 
-**15.9.2**
+## 15.9.2
 
 - gitlab: upgrade CE to v15.9.2
 - gitaly: upgrade to v15.9.2
 - gitlab-pages: upgrade to v15.9.2
 - ubuntu: upgrade to focal-20230301
 
-**15.9.1**
+## 15.9.1
 
 - gitlab: upgrade CE to v15.9.1
 - gitaly: upgrade to v15.9.1
 - gitlab-pages: upgrade to v15.9.1
 
-**15.9.0**
+## 15.9.0
 
 - gitlab: upgrade CE to v15.9.0
 - gitaly: upgrade to v15.9.0
 - gitlab-pages: upgrade to v15.9.0
 - gitlab-shell: upgrade to v14.17.0
 
-**15.8.2**
+## 15.8.2
 
 - gitlab: upgrade CE to v15.8.2
 - gitaly: upgrade to v15.8.2
 - gitlab-pages: upgrade to v15.8.2
 - golang: upgrade to v1.19.6
 
-**15.8.1**
+## 15.8.1
 
 - gitlab: upgrade CE to v15.8.1
 - gitaly: upgrade to v15.8.1
 - gitlab-pages: upgrade to v15.8.1
 - ubuntu: upgrade to focal-20230126
 
-**15.8.0-1**
+## 15.8.0-1
 
 - ruby: rollback to v2.7.7
 
-**15.8.0**
+## 15.8.0
 
 - gitlab: upgrade CE to v15.8.0
 - gitaly: upgrade to v15.8.0
@@ -673,31 +682,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.15.0
 - golang: upgrade to v1.18.10
 
-**15.7.5**
+## 15.7.5
 
 - gitlab: upgrade CE to v15.7.5
 - gitaly: upgrade to v15.7.5
 - gitlab-pages: upgrade to v15.7.5
 
-**15.7.3**
+## 15.7.3
 
 - gitlab: upgrade CE to v15.7.3
 - gitaly: upgrade to v15.7.3
 - gitlab-pages: upgrade to v15.7.3
 
-**15.7.2**
+## 15.7.2
 
 - gitlab: upgrade CE to v15.7.2
 - gitaly: upgrade to v15.7.2
 - gitlab-pages: upgrade to v15.7.2
 
-**15.7.1**
+## 15.7.1
 
 - gitlab: upgrade CE to v15.7.1
 - gitaly: upgrade to v15.7.1
 - gitlab-pages: upgrade to v15.7.1
 
-**15.7.0**
+## 15.7.0
 
 - gitlab: upgrade CE to v15.7.0
 - gitaly: upgrade to v15.7.0
@@ -705,7 +714,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.14.0
 - ruby: upgrade to v3.0.5
 
-**15.6.3**
+## 15.6.3
 
 - gitlab: upgrade CE to v15.6.3
 - gitaly: upgrade to v15.6.3
@@ -714,17 +723,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v2.7.7
 - ruby: upgrade to v3.0.4
 
-**15.6.2**
+## 15.6.2
 
 - gitlab: upgrade CE to v15.6.2
 - gitaly: upgrade to v15.6.2
 
-**15.6.1**
+## 15.6.1
 
 - gitlab: upgrade CE to v15.6.1
 - gitaly: upgrade to v15.6.1
 
-**15.6.0**
+## 15.6.0
 
 - gitlab: upgrade CE to v15.6.0
 - gitaly: upgrade to v15.6.0
@@ -732,72 +741,71 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.63.0
 - golang: upgrade to v1.18.8
 
-**15.5.4**
+## 15.5.4
 
 - gitlab: upgrade CE to v15.5.4
 - gitaly: upgrade to v15.5.4
 
-**15.5.3**
+## 15.5.3
 
 - gitlab: upgrade CE to v15.5.3
 - gitaly: upgrade to v15.5.3
 
-**15.5.2**
+## 15.5.2
 
 - gitlab: upgrade CE to v15.5.2
 - gitaly: upgrade to v15.5.2
 - ubuntu: upgrade to focal-20221019
 
-**15.5.1**
+## 15.5.1
 
 - gitlab: upgrade CE to v15.5.1
 - gitaly: upgrade to v15.5.1
 
-**15.5.0**
+## 15.5.0
 
 - gitlab: upgrade CE to v15.5.0
 - gitaly: upgrade to v15.5.0
 - gitlab-shell: upgrade to v14.12.0
 
-
-**15.4.3**
+## 15.4.3
 
 - gitlab: upgrade CE to v15.4.3
 - gitaly: upgrade to v15.4.3
 - ubuntu: upgrade to focal-20220922
 
-**15.4.2**
+## 15.4.2
 
 - gitlab: upgrade CE to v15.4.2
 - gitaly: upgrade to v15.4.2
 
-**15.4.1**
+## 15.4.1
 
 - gitlab: upgrade CE to v15.4.1
 - gitaly: upgrade to v15.4.1
 
-**15.4.0**
+## 15.4.0
 
 - gitlab: upgrade CE to v15.4.0
 - gitaly: upgrade to v15.4.0
 - ubuntu: upgrade tofocal-20220826
 
-**15.3.3**
+## 15.3.3
 
 - gitlab: upgrade CE to v15.3.3
 - gitaly: upgrade to v15.3.3
 
-**15.3.2**
+## 15.3.2
 
 - gitlab: upgrade CE to v15.3.2
 - gitaly: upgrade to v15.3.2
 
-**15.3.1**
+## 15.3.1
 
 - gitlab: upgrade CE to v15.3.1
 - gitaly: upgrade to v15.3.1
 
-**15.3.0**
+## 15.3.0
 
 - gitlab: upgrade CE to v15.3.0
 - gitaly: upgrade to v15.3.0
@@ -805,19 +813,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.62.0
 - ubuntu: upgrade to focal-20220801
 
-**15.2.2**
+## 15.2.2
 
 - gitlab: upgrade CE to v15.2.2
 - gitaly: upgrade to v15.2.2
 - golang: upgrade to v1.17.13
 
-**15.2.1**
+## 15.2.1
 
 - gitlab: upgrade CE to v15.2.1
 - gitaly: upgrade to v15.2.1
 - gitlab-pages: upgrade to v1.61.1
 
-**15.2.0**
+## 15.2.0
 
 - gitlab: upgrade CE to v15.2.0
 - gitaly: upgrade to v15.2.0
@@ -825,208 +833,245 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.61.0
 - golang: upgrade to v1.17.12
 
-**15.1.3**
+## 15.1.3
 
 - gitlab: upgrade CE to v15.1.3
 - gitaly: upgrade to v15.1.3
 
-**15.1.2**
+## 15.1.2
 
 - gitlab: upgrade CE to v15.1.2
 - gitaly: upgrade to v15.1.2
 
-**15.1.1**
+## 15.1.1
 
 - gitlab: upgrade CE to v15.1.1
 - gitaly: upgrade to v15.1.1
 
-**15.1.0**
+## 15.1.0
 
 - gitlab: upgrade CE to v15.1.0
 - gitaly: upgrade to v15.1.0
 - gitlab-shell: upgrade to v14.7.4
 - gitlab-pages: upgrade to v1.59.0
 
-**15.0.3**
+## 15.0.3
+
 - gitlab: upgrade CE to v15.0.3
 - gitaly: upgrade to v15.0.3
 
-**15.0.2**
+## 15.0.2
+
 - gitlab: upgrade CE to v15.0.2
 - gitaly: upgrade to v15.0.2
 - ubuntu: upgrade to focal-20220531
 
-**15.0.1**
+## 15.0.1
+
 - gitlab: upgrade CE to v15.0.1
 - gitaly: upgrade to v15.0.1
 - golang: upgrade to v1.17.11
 
-**15.0.0**
+## 15.0.0
+
 - gitlab: upgrade CE to v15.0.0
 - gitaly: upgrade to v15.0.0
 - golang: upgrade to v1.17.10
 - gitlab-shell: upgrade to v14.3.0
 - gitlab-pages: upgrade to v1.58.0
 
-**14.10.3**
+## 14.10.3
+
 - gitlab: upgrade CE to v14.10.3
 - gitaly: upgrade to v14.10.3
 
-**14.10.2**
+## 14.10.2
+
 - gitlab: upgrade CE to v14.10.2
 - gitaly: upgrade to v14.10.2
 - ubuntu: upgrade to focal-20220426
 
-**14.10.1**
+## 14.10.1
+
 - gitlab: upgrade CE to v14.10.1
 - gitaly: upgrade to v14.10.1
 - ubuntu: upgrade to focal-20220426
 
-**14.10.0**
+## 14.10.0
+
 - gitlab: upgrade CE to v14.10.0
 - gitaly: upgrade to v14.10.0
 - gitlab-shell: upgrade to v13.25.1
 - ubuntu: upgrade to focal-20220415
 
-**14.9.3**
+## 14.9.3
+
 - gitlab: upgrade CE to v14.9.3
 - gitaly: upgrade to v14.9.3
 - golang: upgrade to v1.17.9
 - ruby: upgrade to v2.7.6
 - ubuntu: upgrade to focal-20220404
 
-**14.9.2**
+## 14.9.2
+
 - gitlab: upgrade CE to v14.9.2
 - gitaly: upgrade to v14.9.2
 - gitlab-pages: upgrade to v1.56.1
 
-**14.9.1**
+## 14.9.1
+
 - gitlab: upgrade CE to v14.9.1
 - gitaly: upgrade to v14.9.1
 
-**14.9.0**
+## 14.9.0
+
 - gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.56.0
 - gitlab-shell: upgrade to v13.24.0
 
-**14.8.4**
+## 14.8.4
+
 - gitlab: upgrade CE to v14.8.4
 - gitaly: upgrade to v14.8.4
 
-**14.8.3**
+## 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**
+## 14.8.2
+
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
 
-**14.8.1**
+## 14.8.1
+
 - gitlab: upgrade CE to v14.8.1
 - gitaly: upgrade to v14.8.1
 
-**14.8.0**
+## 14.8.0
+
 - gitlab: upgrade CE to v14.8.0
 - gitaly: upgrade to v14.8.0
 - gitlab-pages: upgrade to v1.54.0
 - gitlab-shell: v13.23.2
 
-**14.7.3**
+## 14.7.3
+
 - gitlab: upgrade CE to v14.7.3
 - gitaly: upgrade to v14.7.3
 - golang: upgrade to v1.17.7
 
-**14.7.2**
+## 14.7.2
+
 - gitlab: upgrade CE to v14.7.2
 - gitaly: upgrade to v14.7.2
 - ubuntu: upgrade to focal-20220113
 
-**14.7.1**
+## 14.7.1
+
 - gitlab: upgrade CE to v14.7.1
 - gitaly: upgrade to v14.7.1
 
-**14.7.0**
+## 14.7.0
+
 - gitlab: upgrade CE to v14.7.0
 - gitaly: upgrade to v14.7.0
 - gitlab-shell: v13.22.2
 - gitlab-pages: upgrade to v1.51.0
 
-**14.6.3**
+## 14.6.3
+
 - gitlab: upgrade CE to v14.6.3
 - gitaly: upgrade to v14.6.3
 
-**14.6.2**
+## 14.6.2
+
 - gitlab: upgrade CE to v14.6.2
 - gitaly: upgrade to v14.6.2
 - golang: upgrade to v1.17.6
 - ubuntu: upgrade to focal-20220105
 
-**14.6.1**
+## 14.6.1
+
 - gitlab: upgrade CE to v14.6.1
 - gitaly: upgrade to v14.6.1
 
-**14.6.0**
+## 14.6.0
+
 - gitlab: upgrade CE to v14.6.0
 - gitaly: upgrade to v14.6.0
 - gitlab-pages: upgrade to v1.49.0
 
-**14.5.2**
+## 14.5.2
+
 - gitlab: upgrade CE to v14.5.2
 - gitaly: upgrade to v14.5.2
 - golang: upgrade to v1.17.5
 
-**14.5.1**
+## 14.5.1
+
 - gitlab: upgrade CE to v14.5.1
 - gitaly: upgrade to v14.5.1
 - gitlab-shell: v13.22.1
 
-**14.5.0**
+## 14.5.0
+
 - gitlab: upgrade CE to v14.5.0
 - gitaly: upgrade to v14.5.0
 - gitlab-pages: upgrade to v1.48.0
 - gitlab-shell: v13.22.0
 
-**14.4.4**
+## 14.4.4
+
 - gitlab: upgrade CE to v14.4.4
 - gitaly: upgrade to v14.4.4
 - ruby: upgrade to v2.7.5
 
-**14.4.3**
+## 14.4.3
+
 - gitlab: upgrade CE to v14.4.3
 - gitaly: upgrade to v14.4.3
 - golang: upgrade to v1.17.4
 
-**14.4.2**
+## 14.4.2
+
 - gitlab: upgrade CE to v14.4.2
 - gitaly: upgrade to v14.4.2
 - redis: upgrade to v6.2.6
 
-**14.4.1**
+## 14.4.1
+
 - gitlab: upgrade CE to v14.4.1
 - gitaly: upgrade to v14.4.1
 
-**14.4.0**
+## 14.4.0
+
 - gitlab: upgrade CE to v14.4.0
 - gitaly: upgrade to v14.4.0
 - gitlab-pages: upgrade to v1.46.0
 
-**14.3.3**
+## 14.3.3
+
 - gitlab: upgrade CE to v14.3.3
 - gitaly: upgrade to v14.3.3
 
-**14.3.2**
+## 14.3.2
+
 - gitlab: upgrade CE to v14.3.2
 - gitaly: upgrade to v14.3.2
 - gitlab-shell: v13.21.1
 
-**14.3.1**
+## 14.3.1
+
 - gitlab: upgrade CE to v14.3.1
 - gitaly: upgrade to v14.3.1
 
-**14.3.0**
+## 14.3.0
+
 - gitlab: upgrade CE to v14.3.0
 - gitaly: upgrade to v14.3.0
 - gitlab-shell: v13.21.0
@@ -1034,183 +1079,219 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: compile ruby from source and use v2.7.4
 - ubuntu: upgrade to focal-20211006
 
-**14.2.5**
+## 14.2.5
+
 - gitlab: upgrade CE to v14.2.5
 - gitaly: upgrade to v14.2.5
 
-**14.2.4**
+## 14.2.4
+
 - gitlab: upgrade CE to v14.2.4
 - gitaly: upgrade to v14.2.4
 - golang: upgrade to v1.17.1
 
-**14.2.3**
+## 14.2.3
+
 - gitlab: upgrade CE to v14.2.3
 - gitaly: upgrade to v14.2.3
 
-**14.2.2**
+## 14.2.2
+
 - gitlab: upgrade CE to v14.2.2
 - gitaly: upgrade to v14.2.2
 - ubuntu: upgrade to focal-20210827
 
-**14.2.1**
+## 14.2.1
+
 - gitlab: upgrade CE to v14.2.1
 - gitaly: upgrade to v14.2.1
 
-**14.2.0**
+## 14.2.0
+
 - gitlab: upgrade CE to v14.2.0
 - gitaly: upgrade to v14.2.0
 - gitlab-pages: upgrade to v1.42.0
 - golang: upgrade to v1.17
 
-**14.1.3**
+## 14.1.3
+
 - gitlab: upgrade CE to v14.1.3
 - gitaly: upgrade to v14.1.3
 - golang: upgrade to v1.16.7
 
-**14.1.2**
+## 14.1.2
+
 - gitlab: upgrade CE to v14.1.2
 - gitaly: upgrade to v14.1.2
 - gitlab-shell: upgrade to v13.19.1
 
-**14.1.1**
+## 14.1.1
+
 - gitlab: upgrade CE to v14.1.1
 - gitaly: upgrade to v14.1.1
 - ubuntu: upgrade to focal-20210723
 
-**14.1.0**
+## 14.1.0
+
 - gitlab: upgrade CE to v14.1.0
 - gitaly: upgrade to v14.1.0
 
-**14.0.6**
+## 14.0.6
+
 - gitlab: upgrade CE to v14.0.6
 - gitaly: upgrade to v14.0.6
 - golang: upgrade to v1.16.6
 
-**14.0.5**
+## 14.0.5
+
 - gitlab: upgrade CE to v14.0.5
 - gitaly: upgrade to v14.0.5
 
-**14.0.4**
+## 14.0.4
+
 - gitlab: upgrade CE to v14.0.4
 - gitaly: upgrade to v14.0.4
 
-**14.0.3**
+## 14.0.3
+
 - gitlab: upgrade CE to v14.0.3
 - gitaly: upgrade to v14.0.3
 
-**14.0.2**
+## 14.0.2
+
 - gitlab: upgrade CE to v14.0.2
 - gitaly: upgrade to v14.0.2
 
-**14.0.1**
+## 14.0.1
+
 - gitlab: upgrade CE to v14.0.1
 - gitaly: upgrade to v14.0.1
 
-**14.0.0**
+## 14.0.0
+
 - gitlab: upgrade CE to v14.0.0
 - gitaly: upgrade to v14.0.0
 - gitlab-shell: upgrade to v13.19.0
 - gitlab-pages: upgrade to v1.40.0
 
-**13.12.5**
+## 13.12.5
+
 - gitlab: upgrade CE to v13.12.5
 - gitaly: upgrade to v13.12.5
 - ubuntu: upgrade to focal-20210609
 
-**13.12.4**
+## 13.12.4
+
 - gitlab: upgrade CE to v13.12.4
 - gitaly: upgrade to v13.12.4
 
-**13.12.3**
+## 13.12.3
+
 - gitlab: upgrade CE to v13.12.3
 - gitaly: upgrade to v13.12.3
 - golang: upgrade to v1.16.5
 
-**13.12.2**
+## 13.12.2
+
 - gitlab: upgrade CE to v13.12.2
 - gitaly: upgrade to v13.12.2
 
-**13.12.1**
+## 13.12.1
+
 - gitlab: upgrade CE to v13.12.1
 - gitaly: upgrade to v13.12.1
 
-**13.12.0**
+## 13.12.0
+
 - gitlab: upgrade CE to v13.12.0
 - gitlab-shell: upgrade to v13.18.0
 - gitlab-pages: upgrade to v1.39.0
 - gitaly: upgrade to v13.12.0
 
-**13.11.4**
+## 13.11.4
+
 - gitlab: upgrade CE to v13.11.4
 - gitaly: upgrade to v13.11.4
 - golang: upgrade to v1.16.4
 - ubuntu: upgrade to focal-20210416
 
-**13.11.3**
+## 13.11.3
+
 - gitlab: upgrade CE to v13.11.3
 - gitaly: upgrade to v13.11.3
 
-**13.11.2**
+## 13.11.2
+
 - gitlab: upgrade CE to v13.11.2
 - gitaly: upgrade to v13.11.2
 
-**13.11.1**
+## 13.11.1
+
 - gitlab: upgrade CE to v13.11.1
 - gitaly: upgrade to v13.11.1
 
-**13.11.0**
+## 13.11.0
+
 - gitlab: upgrade CE to v13.11.0
 - gitaly: upgrade to v13.11.0
 - gitlab-pages: upgrade to v1.38.0
 - ubuntu: upgrade to focal-20210401
 
-**13.10.3**
+## 13.10.3
+
 - gitlab: upgrade CE to v13.10.3
 - gitaly: upgrade to v13.10.3
 
-**13.10.2**
+## 13.10.2
+
 - gitlab: upgrade CE to v13.10.2
 - gitaly: upgrade to v13.10.2
 - golang: upgrade to v1.16.3
 - ubuntu: upgrade to bionic-20210325
 
-**13.10.1**
+## 13.10.1
+
 - gitlab: upgrade CE to v13.10.1
 - gitaly: upgrade to v13.10.1
 - added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma)
 
-**13.10.0**
+## 13.10.0
+
 - gitlab: upgrade CE to v13.10.0
 - gitaly: upgrade to v13.10.0
 - gitlab-pages: upgrade to v1.36.0
 
-**13.9.5**
+## 13.9.5
+
 - gitlab: upgrade CE to v13.9.5
 - gitaly: upgrade to v13.9.5
 
-**13.9.4**
+## 13.9.4
+
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
 - golang: upgrade to v1.16.2
 - ubuntu: upgrade to bionic-20210222
 
-**13.9.3**
+## 13.9.3
+
 - gitlab: upgrade CE to v13.9.3
 - gitaly: upgrade to v13.9.3
 - gitlab-shell: upgrade to v13.17.0
 
-**13.9.2**
+## 13.9.2
+
 - gitlab: upgrade CE to v13.9.2
 - gitaly: upgrade to v13.9.2
 - gitlab-workhorse: upgrade to v8.63.2
 
+## 13.9.1
 
-**13.9.1**
 - gitlab: upgrade CE to v13.9.1
 - gitaly: upgrade to v13.9.1
 
+## 13.9.0
 
-**13.9.0**
 - gitlab: upgrade CE to v13.9.0
 - gitaly: upgrade to v13.9.0
 - gitlab-shell: upgrade to v13.16.1
@@ -1218,7 +1299,8 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-workhorse: upgrade to v8.63.0
 - golang: upgrade to v1.16
 
-**13.8.4**
+## 13.8.4
+
 - added `SSL_PROTOCOLS` option to change protocols of the nginx
 - added `SSL_REGISTRY_CIPHERS`
 - added `SSL_REGISTRY_PROTOCOLS`
@@ -1228,20 +1310,24 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitaly: upgrade to v13.8.4
 - gitlab-shell: upgrade to v13.15.1
 
-**13.8.3**
+## 13.8.3
+
 - gitlab: upgrade CE to v13.8.3
 - gitaly: upgrade to v13.8.3
 - golang: upgrade to v1.15.8
 
-**13.8.2**
+## 13.8.2
+
 - gitlab: upgrade CE to v13.8.2
 - gitaly: upgrade to v13.8.2
 
-**13.8.1**
+## 13.8.1
+
 - gitlab: upgrade CE to v13.8.1
 - gitaly: upgrade to v13.8.1
 
-**13.8.0**
+## 13.8.0
+
 - gitlab: upgrade CE to v13.8.0
 - gitaly: upgrade to v13.8.0
 - gitlab-shell: upgrade to v13.15.0
@@ -1250,20 +1336,24 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.15.7
 - ubuntu: upgrade to bionic-20210118
 
-**13.7.4**
+## 13.7.4
+
 - gitlab: upgrade CE to v13.7.4
 
-**13.7.3**
+## 13.7.3
+
 - gitlab: upgrade CE to v13.7.3
 - gitlab-pages: upgrade to v1.34.0
 - gitlab-shell: upgrade to v13.7.3
 - gitlab-workhorse: upgrade to v8.58.2
 
-**13.7.1**
+## 13.7.1
+
 - gitlab: upgrade CE to v13.7.1
 - gitaly: upgrade v13.7.1
 
-**13.7.0**
+## 13.7.0
+
 - gitlab: upgrade CE to v13.7.0
 - gitaly: upgrade v13.7.0
 - gitlab-shell: upgrade to v13.14.0
@@ -1272,19 +1362,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to ubuntu bionic-20201119
 - postgresql: upgrade to postgresql 12
 
-**13.6.3**
+## 13.6.3
+
 - gitlab: upgrade CE to v13.6.3
 - gitaly: upgrade v13.6.3
 
-**13.6.2**
+## 13.6.2
+
 - gitlab: upgrade CE to v13.6.2
 - gitaly: upgrade v13.6.2
 
-**13.6.1**
+## 13.6.1
+
 - gitlab: upgrade CE to v13.6.1
 - gitaly: upgrade v13.6.1
 
-**13.6.0**
+## 13.6.0
+
 - gitlab: upgrade CE to v13.6.0
 - gitaly: upgrade v13.6.0
 - gitlab-shell: upgrade to v13.13.0
@@ -1293,34 +1387,41 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - use bundler 2.1.4
 - use ruby 2.7
 
-**13.5.4**
+## 13.5.4
+
 - gitlab: upgrade CE to v13.5.4
 - gitaly: upgrade v13.5.4
 
-**13.5.3**
+## 13.5.3
+
 - gitlab: upgrade CE to v13.5.3
 - gitaly: upgrade v13.5.3
 
-**13.5.2**
+## 13.5.2
+
 - gitlab: upgrade CE to v13.5.2
 - gitaly: upgrade v13.5.2
 
-**13.5.1**
+## 13.5.1
+
 - gitlab: upgrade CE to v13.5.1
 - gitaly: upgrade v13.5.1
 - gitlab-shell: upgrade to v13.11.0
 - gitlab-pages: upgrade to v1.28.0
 - gitlab-workhorse: upgrade to v8.51.0
 
-**13.4.4**
+## 13.4.4
+
 - gitlab: upgrade CE to v13.4.4
 - gitaly: upgrade to v13.4.4
 
-**13.4.3**
+## 13.4.3
+
 - gitlab: upgrade CE to v13.4.3
 - gitaly: upgrade to v13.4.3
 
-**13.4.2**
+## 13.4.2
+
 - gitlab: upgrade CE to v13.4.2
 - gitaly: upgrade to v13.4.2
 - gitlab-pages: upgrade to 1.25.0
@@ -1328,87 +1429,109 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: uprade to 13.7.0
 - ubuntu: upgrade to bionic-20200921
 
-**13.3.4**
+## 13.3.4
+
 - gitlab: upgrade CE to v13.3.4
 - gitaly: upgrade to v13.3.4
 
-**13.3.1**
+## 13.3.1
+
 - gitlab: upgrade CE to v13.3.1
 - gitaly: upgrade to v13.3.1
 
-**13.3.0**
+## 13.3.0
+
 - gitlab: upgrade CE to v13.3.0
 - gitaly: upgrade to v13.3.0
 - gitlab-pages: upgrade to v1.22.0
 - gitlab-shell: upgrade to v13.6.0
 - gitlab-workhorse: upgrade to v8.39.0
 
-**13.2.6**
+## 13.2.6
+
 - gitlab: upgrade CE to v13.2.6
 
-**13.2.4**
+## 13.2.4
+
 - gitlab: upgrade CE to v13.2.4
 - ubuntu: upgrade to bionic-20200713
 
-**13.2.3**
+## 13.2.3
+
 - gitlab: upgrade CE to v13.2.3
 - golang: upgrade to 1.14.7
 - gitaly: upgrade to 13.2.3
 - postgresql: add btree_gist extension
 
-**13.2.2**
+## 13.2.2
+
 - gitlab: upgrade CE to v13.2.2
 
-**13.2.1**
+## 13.2.1
+
 - gitlab: upgrade CE to v13.2.1
 
-**13.0.7**
+## 13.0.7
+
 - gitlab: upgrade CE to v13.0.7
 
-**13.0.6**
+## 13.0.6
+
 - gitlab: upgrade CE to v13.0.6
 
-**13.0.5**
+## 13.0.5
+
 - gitlab: upgrade CE to v13.0.5
 
-**13.0.3**
+## 13.0.3
+
 - gitlab: upgrade CE to v13.0.3
 
-**13.0.2**
+## 13.0.2
+
 - gitlab: upgrade CE to v13.0.2
 
-**13.0.1**
+## 13.0.1
+
 - gitlab: upgrade CE to v13.0.1
 
-**13.0.0**
+## 13.0.0
+
 - gitlab: upgrade CE to v13.0.0
 
-**12.10.6**
+## 12.10.6
+
 - gitlab: upgrade CE to v12.10.6
 
-**12.10.4**
+## 12.10.4
+
 - updated to ubuntu:bionic-20200403
 - gitlab-workhorse: update to 8.30.1
 - sync: upstream configs
 - gitlab: upgrade to 12.10.4
 
-**12.9.5**
+## 12.9.5
+
 - gitlab: updated to 12.9.5
 - gitlab-shell: updated to 12.2.0
 - gitaly: updated to 12.10.0
 
-**12.9.4**
+## 12.9.4
+
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
 
-**12.9.2**
+## 12.9.2
+
 - gitlab: upgrade CE to v12.9.2
 
-**12.9.1**
+## 12.9.1
+
 - gitlab: upgrade CE to v12.9.1
 
-**12.9.0**
+## 12.9.0
+
 - gitlab: upgrade CE to v12.9.0
 - replaced unicorn with puma
 - Removed `UNICORN_WORKERS`
@@ -1418,61 +1541,74 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `PUMA_WORKERS`
 - Added `PUMA_TIMEOUT`
 
-**12.8.8**
+## 12.8.8
+
 - gitlab: upgrade CE to v12.8.8
 
-**12.8.7**
+## 12.8.7
+
 - gitlab: upgrade CE to v12.8.7
 
-**12.8.6**
+## 12.8.6
+
 - gitlab: upgrade CE to v12.8.6
 
-**12.8.5**
+## 12.8.5
+
 - gitlab: upgrade CE to v12.8.5
 
-**12.8.4**
+## 12.8.4
+
 - gitlab: upgrade CE to v12.8.4
 
-**12.8.3**
+## 12.8.3
+
 - gitlab: upgrade CE to v12.8.3
 
-**12.8.2**
+## 12.8.2
+
 - gitlab: upgrade CE to v12.8.2
 
-**12.8.1**
+## 12.8.1
+
 - gitlab: upgrade CE to v12.8.1
 
-**12.8.0**
+## 12.8.0
+
 - gitlab: upgrade CE to v12.8.0
 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
 
-**12.7.8**
+## 12.7.8
+
 - Upgrade GitLab CE to 12.7.8
 
-**12.7.7**
+## 12.7.7
+
 - Upgrade GitLab CE to 12.7.7
 - Add Generic OAuth Provider PR#2070
 
-**12.7.7**
-- Upgrade GitLab CE to 12.7.7
+## 12.7.6
 
-**12.7.6**
 - gitlab: upgrade CE to v12.7.6
 
-**12.7.5**
+## 12.7.5
+
 - gitlab: upgrade CE to v12.7.5
 
-**12.7.4**
+## 12.7.4
+
 - Upgrade GitLab CE to 12.7.4
 - Update golang to 1.13.7
 - Update gitlab-pages to 1.15.0
 - Update gitlab-workhorse to 8.20.0
 - Update gitaly to 1.85.0
 
-**12.7.2**
+## 12.7.2
+
 - Upgrade GitLab CE to 12.7.2
 
-**12.7.0**
+## 12.7.0
+
 - Update gitlab-shell to 11.0.0
 - Upgrade GitLab CE to 12.7.0
 - Update golang to 1.13.6
@@ -1480,124 +1616,163 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Update gitlab-pages to 1.14.0
 - Update gitlab-workhorse to 8.19.0
 
-**12.6.4**
+## 12.6.4
+
 - gitlab: upgrade CE to v12.6.4
 
-**12.6.3**
+## 12.6.3
+
 - gitlab: upgrade CE to v12.6.3
 
-**12.6.2**
+## 12.6.2
+
 - gitlab: upgrade CE to v12.6.2
 
-**12.6.1**
+## 12.6.1
+
 - gitlab: upgrade CE to v12.6.1
 
-**12.6.0**
+## 12.6.0
+
 - gitlab: upgrade CE to v12.6.0
 
-**12.5.7**
+## 12.5.7
+
 - gitlab: upgrade CE to v12.5.7
 
-**12.5.6**
+## 12.5.6
+
 - gitlab: upgrade CE to v12.5.6
 
-**12.5.5**
+## 12.5.5
+
 - gitlab: upgrade CE to v12.5.5
 
-**12.5.4**
+## 12.5.4
+
 - gitlab: upgrade CE to v12.5.4
 - Update golang to 1.12.14
 
-**12.5.3**
+## 12.5.3
+
 - gitlab: upgrade CE to v12.5.3
 
-**12.5.2**
+## 12.5.2
+
 - gitlab: upgrade CE to v12.5.2
 
-**12.5.1**
+## 12.5.1
+
 - gitlab: upgrade CE to v12.5.1
 
-**12.5.0**
+## 12.5.0
+
 - gitlab: upgrade CE to v12.5.0
 
-**12.4.3**
+## 12.4.3
+
 - gitlab: upgrade CE to v12.4.3
 
-**12.4.2**
+## 12.4.2
+
 - gitlab: upgrade CE to v12.4.2
 
-**12.4.1**
+## 12.4.1
+
 - gitlab: upgrade CE to v12.4.1
 
-**12.4.0**
+## 12.4.0
+
 - gitlab: upgrade CE to v12.4.0
 
-**12.3.5**
+## 12.3.5
+
 - gitlab: upgrade CE to v12.3.5
 
-**12.3.4**
+## 12.3.4
+
 - gitlab: upgrade CE to v12.3.4
 
-**12.3.3**
+## 12.3.3
+
 - gitlab: upgrade CE to v12.3.3
 
-**12.3.2**
+## 12.3.2
+
 - gitlab: upgrade CE to v12.3.2
 
-**12.3.1**
+## 12.3.1
+
 - gitlab: upgrade CE to v12.3.1
 
-**12.3.0**
+## 12.3.0
+
 - gitlab: upgrade CE to v12.3.0
 
-**12.2.5**
+## 12.2.5
+
 - gitlab: upgrade CE to v12.2.5
 
-**12.2.4**
+## 12.2.4
+
 - gitlab: upgrade CE to v12.2.4
 
-**12.2.3**
+## 12.2.3
+
 - gitlab: upgrade CE to v12.2.3
 
-**12.2.1**
+## 12.2.1
+
 - gitlab: upgrade CE to v12.2.1
 
-**12.2.0**
+## 12.2.0
+
 - gitlab: upgrade CE to v12.2.0
 - upgrade base image to ubuntu:bionic
 
-**12.1.6**
+## 12.1.6
+
 - gitlab: upgrade CE to v12.1.6
 
-**12.1.4**
+## 12.1.4
+
 - gitlab: upgrade CE to v12.1.4
 
-**12.1.3**
+## 12.1.3
+
 - gitlab: upgrade CE to v12.1.3
 
-**12.1.2**
+## 12.1.2
+
 - gitlab: upgrade CE to v12.1.2
 
-**12.1.1**
+## 12.1.1
+
 - gitlab: upgrade CE to v12.1.1
 
-**12.1.0**
+## 12.1.0
+
 - gitlab: upgrade CE to v12.1.0
 - Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html)
 
-**12.0.4**
+## 12.0.4
+
 - gitlab: upgrade CE to v12.0.4
 
-**12.0.3**
+## 12.0.3
+
 - gitlab: upgrade CE to v12.0.3
 
-**12.0.2**
+## 12.0.2
+
 - gitlab: upgrade CE to v12.0.2
 
-**12.0.1**
+## 12.0.1
+
 - gitlab: upgrade CE to v12.0.1
 
-**12.0.0**
+## 12.0.0
+
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
 - Update gitlab-shell to 9.3.0
@@ -1605,106 +1780,135 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: update to 2.6
 - python: update to 3
 
-**11.11.3**
+## 11.11.3
+
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
 - Update golang to 1.12.6
 
-**11.11.2**
+## 11.11.2
+
 - gitlab: upgrade CE to v11.11.2
 - Update gitaly to 1.42.3
 
-**11.11.1**
+## 11.11.1
+
 - gitlab: upgrade CE to v11.11.1
 - Update gitaly to 1.42.2
 
-**11.11.0**
+## 11.11.0
+
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
 - Update gitlab-shell to 9.1.0
 - Update gitlab-workhorse to 8.7.0
 
-**11.10.4**
+## 11.10.4
+
 - gitlab: upgrade CE to v11.10.4
 
-**11.10.3**
+## 11.10.3
+
 - gitlab: upgrade CE to v11.10.3
 
-**11.10.2**
+## 11.10.2
+
 - gitlab: upgrade CE to v11.10.2
 
-**11.10.1**
+## 11.10.1
+
 - gitlab: upgrade CE to v11.10.1
 
-**11.10.0**
+## 11.10.0
+
 - gitlab: upgrade CE to v11.10.0
 
-**11.9.8**
+## 11.9.8
+
 - gitlab: upgrade CE to v11.9.8
 
-**11.9.7**
+## 11.9.7
+
 - gitlab: upgrade CE to v11.9.7
 
-**11.9.6**
+## 11.9.6
+
 - gitlab: upgrade CE to v11.9.6
 
-**11.9.5**
+## 11.9.5
+
 - gitlab: upgrade CE to v11.9.5
 
-**11.9.4**
+## 11.9.4
+
 - gitlab: upgrade CE to v11.9.4
 - Update gitlab-workhorse to 8.3.3
 
-**11.9.1**
+## 11.9.1
+
 - gitlab: upgrade CE to v11.9.1
 - Update gitaly to 1.27.1
 
-**11.9.0**
+## 11.9.0
+
 - gitlab: upgrade CE to v11.9.0
 
-**11.8.3**
+## 11.8.3
+
 - gitlab: upgrade CE to v11.8.3
 
-**11.8.2**
+## 11.8.2
+
 - gitlab: upgrade CE to v11.8.2
 
-**11.8.1**
+## 11.8.1
+
 - gitlab: upgrade CE to v11.8.1
 
-**11.8.0**
+## 11.8.0
+
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
 - Update gitaly to 1.20.0
 - Update gitlab-pages to 1.5.0
 
-**11.7.5**
+## 11.7.5
+
 - gitlab: upgrade CE to v11.7.5
 
-**11.7.4**
+## 11.7.4
+
 - gitlab: upgrade CE to v11.7.4
 
-**11.7.3**
+## 11.7.3
+
 - gitlab: upgrade CE to v11.7.3
 - Update gitlab-workhorse to 8.1.1
 - Update gitaly to 1.13.0
 - Update gitlab-pages to 1.4.0
 
-**11.7.0**
+## 11.7.0
+
 - gitlab: upgrade CE to v11.7.0
 
-**11.6.5**
+## 11.6.5
+
 - gitlab: upgrade CE to v11.6.5
 
-**11.6.4**
+## 11.6.4
+
 - gitlab: upgrade CE to v11.6.4
 
-**11.6.3**
+## 11.6.3
+
 - gitlab: upgrade CE to v11.6.3
 
-**11.6.2**
+## 11.6.2
+
 - gitlab: upgrade CE to v11.6.2
 
-**11.6.1**
+## 11.6.1
+
 - gitlab: upgrade CE to v11.6.1
 - Added `GITLAB_IMPERSONATION_ENABLED`
 - Added `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
@@ -1714,7 +1918,8 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_PAGES_ACCESS_SECRET`
 - Added `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
-**11.6.0**
+## 11.6.0
+
 - gitlab: upgrade CE to v11.6.0
 - Update gitaly to 1.7.1
 - Update gitlab-shell to 8.4.3
@@ -1729,158 +1934,204 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_BACKUP_DIR_GROUP`
 - Added `GITLAB_PAGES_NGINX_PROXY`
 
-**11.5.5**
+## 11.5.5
+
 - gitlab: upgrade CE to v11.5.5
 
-**11.5.4**
+## 11.5.4
+
 - gitlab: upgrade CE to v11.5.4
 
-**11.5.3**
+## 11.5.3
+
 - gitlab: upgrade CE to v11.5.3
 
-**11.5.2**
+## 11.5.2
+
 - gitlab: upgrade CE to v11.5.2
 
-**11.5.1-1**
+## 11.5.1-1
+
 - Fixed GitLab Dependencies
 
-**11.5.1**
+## 11.5.1
+
 - gitlab: upgrade CE to v11.5.1
 
-**11.5.0**
+## 11.5.0
+
 - gitlab: upgrade CE to v11.5.0
 
-**11.4.7**
+## 11.4.7
+
 - gitlab: upgrade CE to v11.4.7
 
-**11.4.6**
+## 11.4.6
+
 - gitlab: upgrade CE to v11.4.6
 
-**11.4.5**
+## 11.4.5
+
 - gitlab: upgrade CE to v11.4.5
 
-**11.4.4**
+## 11.4.4
+
 - gitlab: upgrade CE to v11.4.4
 - golang: update to 1.10.4
 
-**11.4.3**
+## 11.4.3
+
 - gitlab: upgrade CE to v11.4.3
 
-**11.4.2**
+## 11.4.2
+
 - gitlab: upgrade CE to v11.4.2
 
-**11.4.1**
+## 11.4.1
+
 - gitlab: upgrade CE to v11.4.1
 - Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731)
 
-**11.4.0**
+## 11.4.0
+
 - gitlab: upgrade CE to v11.4.0
 - baseimage: upgrade to xenial-20181005
 
-**11.3.6**
+## 11.3.6
+
 - gitlab: upgrade CE to v11.3.6
 
-**11.3.5**
+## 11.3.5
+
 - gitlab: upgrade CE to v11.3.5
 
-**11.3.4**
+## 11.3.4
+
 - gitlab: upgrade CE to v11.3.4
 
-**11.3.3**
+## 11.3.3
+
 - gitlab: upgrade CE to v11.3.3
 
-**11.3.2**
+## 11.3.2
+
 - gitlab: upgrade CE to v11.3.2
 
-**11.3.1**
+## 11.3.1
+
 - gitlab: upgrade CE to v11.3.1
 
-**11.3.0**
+## 11.3.0
+
 - gitlab: upgrade CE to v11.3.0
 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
 - Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699)
 - Fix gitlay-ssh symlink to enable rebase/squash in forks
 
-**11.2.3**
+## 11.2.3
+
 - gitlab: upgrade CE to v11.2.3
 
-**11.2.2**
+## 11.2.2
+
 - gitlab: upgrade CE to v11.2.2
 
-**11.2.1**
+## 11.2.1
+
 - gitlab: upgrade CE to v11.2.1
 
-**11.2.0**
+## 11.2.0
+
 - gitlab: upgrade CE to v11.2.0
 - ADD `GITLAB_DEFAULT_THEME`
 
-**11.1.4**
+## 11.1.4
+
 - gitlab: upgrade CE to v11.1.4
 
-**11.1.3**
+## 11.1.3
+
 - gitlab: upgrade CE to v11.1.3
 - Upgrade redis to 4.0.9-1
 
-**11.1.2**
+## 11.1.2
+
 - gitlab: upgrade CE to v11.1.2
 
-**11.1.1**
+## 11.1.1
+
 - gitlab: upgrade CE to v11.1.1
 
-**11.1.0**
+## 11.1.0
+
 - gitlab: upgrade CE to v11.1.0
 
-**11.0.4**
+## 11.0.4
+
 - gitlab: upgrade CE to v11.0.4
 
-**11.0.3**
+## 11.0.3
+
 - gitlab: upgrade CE to v11.0.3
 - ruby: update to 2.4
 
-**11.0.2**
+## 11.0.2
+
 - gitlab: upgrade CE to v11.0.2
 
-**11.0.1**
+## 11.0.1
+
 - gitlab: upgrade CE to v11.0.1
 
-**11.0.0**
+## 11.0.0
+
 - gitlab: upgrade CE to v11.0.0
 
-**10.8.4**
+## 10.8.4
+
 - gitlab: upgrade CE to v10.8.4
 
-**10.8.3-1**
+## 10.8.3-1
+
 - Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628)
 
+## 10.8.3
 
-**10.8.3**
 - gitlab: upgrade CE to v10.8.3
 - Fix potential boot problems on clean setups [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621)
 
-**10.8.2**
+## 10.8.2
+
 - gitlab: upgrade CE to v10.8.2
 
-**10.8.1**
+## 10.8.1
+
 - gitlab: upgrade CE to v10.8.1
 
-**10.8.0**
+## 10.8.0
+
 - gitlab: upgrade CE to v10.8.0
 - Add support for swarm mode with docker-configs and docker secrets ([#1540](https://github.com/sameersbn/docker-gitlab/pull/1540))
 
-**10.7.4**
+## 10.7.4
+
 - gitlab: upgrade CE to v10.7.4
 - FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
-**10.7.3**
+## 10.7.3
+
 - gitlab: upgrade CE to v10.7.3
 
-**10.7.2**
+## 10.7.2
+
 - gitlab: upgrade CE to v10.7.2
 
-**10.7.1**
+## 10.7.1
+
 - gitlab: upgrade CE to v10.7.1
 
-**10.7.0**
+## 10.7.0
+
 - gitlab: upgrade CE to v10.7.0
 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT`
 - ADD `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED`
@@ -1921,90 +2172,115 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
-**10.6.4**
+## 10.6.4
+
 - gitlab: upgrade CE to v10.6.4
 
-**10.6.3**
+## 10.6.3
+
 - gitlab: upgrade CE to v10.6.3
 
-**10.6.2**
+## 10.6.2
+
 - gitlab: upgrade CE to v10.6.2
 - golang: update to 1.9.5
 
-**10.6.1**
+## 10.6.1
+
 - gitlab: upgrade CE to v10.6.1
 
-**10.6.0**
+## 10.6.0
+
 - gitlab: upgrade CE to v10.6.0
 
-**10.5.6**
+## 10.5.6
+
 - gitlab: security upgrade CE to v10.5.6
 
-**10.5.5**
+## 10.5.5
+
 - gitlab: upgrade CE to v10.5.5
 
-**10.5.4**
+## 10.5.4
+
 - gitlab: upgrade CE to v10.5.4
 
-**10.5.3**
+## 10.5.3
+
 - gitlab: upgrade CE to v10.5.3
 
-**10.5.2**
+## 10.5.2
+
 - gitlab: upgrade CE to v10.5.2
 - Fix `GITLAB_UPLOADS_STORAGE_PATH`
 
-**10.5.1**
+## 10.5.1
+
 - gitlab: upgrade CE to v10.5.1
 
-**10.5.0**
+## 10.5.0
+
 - gitlab: upgrade CE to v10.5.0
 - Add `GITLAB_UPLOADS_STORAGE_PATH`
 - Add `GITLAB_UPLOADS_BASE_DIR`
 - Add `LDAP_LOWERCASE_USERNAMES`
 
-**10.4.4**
+## 10.4.4
+
 - gitlab: upgrade CE to v10.4.4
 
-**10.4.3**
+## 10.4.3
+
 - gitlab: upgrade CE to v10.4.3
 
-**10.4.2-1**
+## 10.4.2-1
+
 - FIXED SSH Host Key generation through dropping the support for rsa1
 
-**10.4.2**
+## 10.4.2
+
 - gitlab: upgrade CE to v10.4.2
 
-**10.4.1**
+## 10.4.1
+
 - gitlab: upgrade CE to v10.4.1
 
-**10.4.0**
+## 10.4.0
+
 - gitlab: upgrade CE to v10.4.0
 - docker: upgrade to ubuntu xenial as baseimage
 - golang: update to 1.9.3
 
-**10.3.6**
+## 10.3.6
+
 - gitlab: upgrade CE to v10.3.6
 
-**10.3.5**
+## 10.3.5
+
 - gitlab: upgrade CE to v10.3.5
 
-**10.3.4**
+## 10.3.4
+
 - gitlab: upgrade CE to v10.3.4
 
-**10.3.3**
+## 10.3.3
+
 - gitlab: upgrade CE to v10.3.3
 - ADDED `AWS_BACKUP_ENCRYPTION` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
 - ADDED `AWS_BACKUP_STORAGE_CLASS` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
 - FIXED `AWS_BACKUP_MULTIPART_CHUNK_SIZE` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
 - Apply PaX mark to ruby [1458](https://github.com/sameersbn/docker-gitlab/pull/1458)
 
-**10.3.2**
+## 10.3.2
+
 - gitlab: upgrade CE to v10.3.2
 
-**10.3.1**
+## 10.3.1
+
 - gitlab: upgrade CE to v10.3.1
 
-**10.3.0**
+## 10.3.0
+
 - gitlab: upgrade CE to v10.3.0
 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD`
 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME`
@@ -2013,130 +2289,170 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - REMOVED `GITLAB_MAX_OBJECT_SIZE`
 - REMOVED `GITLAB_TIMEOUT`
 
-**10.2.5**
+## 10.2.5
+
 - gitlab: upgrade CE to v10.2.5
 
-**10.2.4**
+## 10.2.4
+
 - gitlab: upgrade to CE v10.2.4
 
-**10.2.3**
+## 10.2.3
+
 - gitlab: upgrade to CE v10.2.3
 
-**10.2.2**
+## 10.2.2
+
 - gitlab: upgrade to CE v10.2.2
 
-**10.2.1**
+## 10.2.1
+
 - gitlab: upgrade to CE v10.2.1
 
-**10.2.0**
+## 10.2.0
+
 - gitlab: upgrade to CE v10.2.0
 
-**10.1.4**
+## 10.1.4
+
 - gitlab: upgrade to CE v10.1.4
 
-**10.1.3**
+## 10.1.3
+
 - gitlab: upgrade to CE v10.1.3
 
-**10.1.2**
+## 10.1.2
+
 - gitlab: upgrade to CE v10.1.2
 
-**10.1.1**
+## 10.1.1
+
 - gitlab: upgrade to CE v10.1.1
 
-**10.1.0**
+## 10.1.0
+
 - gitlab: upgrade to CE v10.1.0
 - REMOVED `GITALY_ENABLED``
 - ADDED `GITALY_ARTIFACTS_SERVER`
 - ADDED `GITALY_CLIENT_PATH`
 
-**10.0.4**
+## 10.0.4
+
 - gitlab: upgrade to CE v10.0.4
 
-**10.0.3**
+## 10.0.3
+
 - gitlab: upgrade to CE v10.0.3
 
-**10.0.2**
+## 10.0.2
+
 - gitlab: upgrade to CE v10.0.2
 
-**10.0.1**
+## 10.0.1
+
 - gitlab: upgrade to CE v10.0.1
 
-**10.0.0**
+## 10.0.0
+
 - gitlab: upgrade to CE v10.0.0
 
-**9.5.5**
+## 9.5.5
+
 - gitlab: upgrade to CE v9.5.5
 
-**9.5.4**
+## 9.5.4
+
 - gitlab: upgrade to CE v9.5.4
 
-**9.5.3**
+## 9.5.3
+
 - gitlab: upgrade to CE v9.5.3
 
-**9.5.2**
+## 9.5.2
+
 - gitlab: upgrade to CE v9.5.2
 
-**9.5.1**
+## 9.5.1
+
 - gitlab: upgrade to CE v9.5.1
 
-**9.5.0**
+## 9.5.0
+
 - gitlab: upgrade to CE v9.5.0
 
-**9.4.5**
+## 9.4.5
+
 - gitlab: upgrade to CE v9.4.5
 
-**9.4.4**
+## 9.4.4
+
 - gitlab: upgrade to CE v9.4.4
 
-**9.4.3**
+## 9.4.3
+
 - gitlab: upgrade to CE v9.4.3
 
-**9.4.2**
+## 9.4.2
+
 - gitlab: upgrade to CE v9.4.2
 
-**9.4.1**
+## 9.4.1
+
 - gitlab: upgrade to CE v9.4.1
 
-**9.4.0-1**
+## 9.4.0-1
+
 - Fix asset compiling for missing translations
 
-**9.4.0**
+## 9.4.0
+
 - gitlab: upgrade to CE v9.4.0
 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137))
 - Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
 
-**9.3.9**
+## 9.3.9
+
 - gitlab: upgrade to CE v9.3.9
 
-**9.3.8**
+## 9.3.8
+
 - gitlab: upgrade to CE v9.3.8
 - Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
 
-**9.3.7**
+## 9.3.7
+
 - gitlab: upgrade to CE v9.3.7
 
-**9.3.6**
+## 9.3.6
+
 - gitlab: upgrade to CE v9.3.6
 
-**9.3.5**
+## 9.3.5
+
 - gitlab: upgrade to CE v9.3.5
 
-**9.3.4**
+## 9.3.4
+
 - gitlab: upgrade to CE v9.3.4
 
-**9.3.3**
+## 9.3.3
+
 - gitlab: upgrade to CE v9.3.3
 
-**9.3.2**
+## 9.3.2
+
 - gitlab: upgrade to CE v9.3.2
 
-**9.3.1**
+## 9.3.1
+
 - gitlab: upgrade to CE v9.3.1
 
-**9.3.0-1**
+## 9.3.0-1
+
 - Add the missing Gitaly config to let git commands over http/https working
 
-**9.3.0**
+## 9.3.0
+
 - gitlab: upgrade to CE v9.3.0
 - update baseimage to `14.04.20170608`
 - Add `DB_COLLATION` (For MySQL related doesn't recognize by postgres)
@@ -2145,85 +2461,109 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Add `GITALY_SOCKET_PATH`
 - Add `GITALY_ADDRESS`
 
-**9.2.7**
+## 9.2.7
+
 - gitlab: upgrade to CE v9.2.7
 
-**9.2.6**
+## 9.2.6
+
 - gitlab: upgrade to CE v9.2.6
 
-**9.2.5**
+## 9.2.5
+
 - gitlab: upgrade to CE v9.2.5
 
-**9.2.2**
+## 9.2.2
+
 - gitlab: upgrade to CE v9.2.2
 
-**9.2.1**
+## 9.2.1
+
 - gitlab: upgrade to CE v9.2.1
 
-**9.2.0**
+## 9.2.0
+
 - gitlab: upgrade to CE v9.2.0
 - Add flexibility to use versions committed into gitlab-ce
 
-**9.1.4**
+## 9.1.4
+
 - gitlab: upgrade to CE v9.1.4
 
-**9.1.3**
+## 9.1.3
+
 - gitlab: upgrade to CE v9.1.3
 
-**9.1.2**
+## 9.1.2
+
 - gitlab: upgrade to CE v9.1.2
 - update baseimage to `14.04.20170503`
 
-**9.1.1**
+## 9.1.1
+
 - gitlab: upgrade to CE v9.1.1
 
-**9.1.0-1**
+## 9.1.0-1
+
 - Fix gitlab-workhorse version display
 
-**9.1.0**
+## 9.1.0
+
 - gitlab: upgrade to CE v9.1.0
 - gitlab-shell: upgrade to 5.0.2
 - gitlab-workhorse: upgrade to 1.4.3
 
-**9.0.6**
+## 9.0.6
+
 - gitlab: upgrade to CE v9.0.6
 
-**9.0.5**
+## 9.0.5
+
 - gitlab: upgrade to CE v9.0.5
 
-**9.0.4**
+## 9.0.4
+
 - gitlab: upgrade to CE v9.0.4
 
-**9.0.3**
+## 9.0.3
+
 - gitlab: upgrade to CE v9.0.3
 
-**9.0.2**
+## 9.0.2
+
 - gitlab: upgrade to CE v9.0.2
 
-**9.0.1**
+## 9.0.1
+
 - gitlab: upgrade to CE v9.0.1
 - gitlab-workhorse 1.4.2
 
-**9.0.0**
+## 9.0.0
+
 - gitlab: upgrade to CE v9.0.0
 - gitlab-shell 5.0.0
 - gitlab-workhorse 1.4.1
 - gitlab-pages 0.4.0
 
-**8.17.4**
+## 8.17.4
+
 - gitlab: upgrade to CE v8.17.4
 
-**8.17.3**
+## 8.17.3
+
 - gitlab: upgrade to CE v8.17.3
 
-**8.17.2**
+## 8.17.2
+
 - gitlab: upgrade to CE v8.17.2
 
-**8.17.1**
+## 8.17.1
+
 - gitlab: upgrade to CE v8.17.1
 - fixes first problems with gitlab-pages
 
-**8.17.0**
+## 8.17.0
+
 - gitlab: upgrade to CE v8.17.0
 - added `GITLAB_PAGES_ENABLED`
 - added `GITLAB_PAGES_DOMAIN`
@@ -2237,41 +2577,53 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added nodejs 7.x as core dependencies
 - added gitlab-pages daemon
 
-**8.16.6**
+## 8.16.6
+
 - gitlab: upgrade to CE v8.16.6
 - Fix logical bug of Remote Backup
 
-**8.16.5**
+## 8.16.5
+
 - gitlab: upgrade to CE v8.16.5
 
-**8.16.4**
+## 8.16.4
+
 - gitlab: upgrade to CE v8.16.4
 
-**8.16.3**
+## 8.16.3
+
 - gitlab: upgrade to CE v8.16.3
 
-**8.16.2**
+## 8.16.2
+
 - gitlab: upgrade to CE v8.16.2
 
-**8.16.1**
+## 8.16.1
+
 - gitlab: upgrade to CE v8.16.1
 
-**8.16.0**
+## 8.16.0
+
 - gitlab: upgrade to CE v8.16.0
 
-**8.15.4**
+## 8.15.4
+
 - gitlab: upgrade to CE v8.15.4
 
-**8.15.3**
+## 8.15.3
+
 - gitlab: upgrade to CE v8.15.3
 
-**8.15.2**
+## 8.15.2
+
 - gitlab: upgrade to CE v8.15.2
 
-**8.15.1**
+## 8.15.1
+
 - gitlab: upgrade to CE v8.15.1
 
-**8.15.0**
+## 8.15.0
+
 - gitlab: upgrade to CE v8.15.0
 - added `GITLAB_MATTERMOST_ENABLED`
 - added `GITLAB_MATTERMOST_URL`
@@ -2280,268 +2632,343 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added `OAUTH_AUTHENTIQ_SCOPE`
 - added `OAUTH_AUTHENTIQ_REDIRECT_URI`
 
-**8.14.5**
+## 8.14.5
+
 - gitlab: upgrade to CE v8.14.5
 
-**8.14.4**
+## 8.14.4
+
 - gitlab: upgrade to CE v8.14.4
 
-**8.14.3**
+## 8.14.3
+
 - gitlab: upgrade to CE v8.14.3
 
-**8.14.2**
+## 8.14.2
+
 - gitlab: upgrade to CE v8.14.2
 
-**8.14.1**
+## 8.14.1
+
 - gitlab: upgrade to CE v8.14.1
 
-**8.14.0**
+## 8.14.0
+
 - gitlab: upgrade to CE v8.14.0
 - added `IMAP_TIMEOUT`
 - update golang to 1.6.3
 
-**8.13.6**
+## 8.13.6
+
 - gitlab: upgrade to CE v8.13.6
 
-**8.13.5**
+## 8.13.5
+
 - gitlab: upgrade to CE v8.13.5
 
-**Important**:
-We skipped `8.13.4` because it doesn't contain any changes. For more
-information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/)
+## 8.13.4
 
-**8.12.1**
+**Important:** We skipped `8.13.4` because it doesn't contain any changes. For more information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/).
+
+## 8.13.3
 
-**8.13.3**
 - gitlab: upgrade to CE v8.13.3
 
-**8.13.2**
+## 8.13.2
+
 - gitlab: upgrade to CE v8.13.2
 
-**8.13.1**
+## 8.13.1
+
 - gitlab: upgrade to CE v8.13.1
 
-**8.13.0**
+## 8.13.0
+
 - gitlab: upgrade to CE v8.13.0
 - added `GITLAB_EMAIL_SUBJECT_SUFFIX`
 
-**8.12.7**
+## 8.12.7
+
 - gitlab: upgrade to CE v8.12.7
 
-**8.12.6**
+## 8.12.6
+
 - gitlab: upgrade to CE v8.12.6
 
-**8.12.5**
+## 8.12.5
+
 - gitlab: upgrade to CE v8.12.5
 
-**8.12.4**
+## 8.12.4
+
 - gitlab: upgrade to CE v8.12.4
 
-**8.12.3**
+## 8.12.3
+
 - gitlab: upgrade to CE v8.12.3
 
-**Important**:
-We skipped `8.12.2` because it doesn't contain any changes. For more
-information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/)
+## 8.12.2
+
+**Important:** We skipped `8.12.2` because it doesn't contain any changes. For more information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/).
+
+## 8.12.1
 
-**8.12.1**
 - gitlab: upgrade to CE v8.12.1
 
-**8.12.0**
+## 8.12.0
+
 - gitlab: upgrade to CE v8.12.0
 
-**8.11.7**
+## 8.11.7
+
 - gitlab: upgrade to CE v8.11.7
 
-**8.11.6**
+## 8.11.6
+
 - gitlab: upgrade to CE v8.11.6
 
-**8.11.5**
+## 8.11.5
+
 - gitlab: upgrade to CE v8.11.5
 
-**8.11.4**
+## 8.11.4
+
 - gitlab: upgrade to CE v8.11.4
 
-**8.11.3**
+## 8.11.3
+
 - gitlab: upgrade to CE v8.11.3
 
-**8.11.2**
+## 8.11.2
+
 - gitlab: upgrade to CE v8.11.2
 
-**8.11.0**
+## 8.11.0
+
 - gitlab: upgrade to CE v8.11.0
 - added `GITLAB_SECRETS_SECRET_KEY_BASE`
 - added `GITLAB_SECRETS_OTP_KEY_BASE`
 
-**Important**
+## Important
+
 When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/.secret` for  `GITLAB_SECRETS_OTP_KEY_BASE` otherwise it will break your 2FA .
 
-**8.10.7**
+## 8.10.7
+
 - gitlab: upgrade to CE v8.10.7
 
-**8.10.6**
+## 8.10.6
+
 - gitlab: upgrade to CE v8.10.6
 
-**8.10.5**
+## 8.10.5
+
 - gitlab: upgrade to CE v8.10.5
 
-**8.10.4**
+## 8.10.4
+
 - gitlab: upgrade to CE v8.10.4
 
-**8.10.3**
+## 8.10.3
+
 - gitlab: upgrade to CE v8.10.3
 
-**8.10.2-1**
+## 8.10.2-1
+
 - Fix `OAUTH_GOOGLE_RESTRICT_DOMAIN`
 
-**8.10.2**
+## 8.10.2
+
 - gitlab: upgrade to CE v8.10.2
 - Improve `OAUTH_GOOGLE_RESTRICT_DOMAIN` for multiple restricted domains
 
-**8.10.1**
+## 8.10.1
+
 - gitlab: upgrade to CE v8.10.1
 
-**8.10.0**
+## 8.10.0
+
 - gitlab: upgrade to CE v8.10.0
 
-**8.9.6**
+## 8.9.6
+
 - gitlab: upgrade to CE v8.9.6
 
-**8.9.5**
+## 8.9.5
+
 - gitlab: upgrade to CE v8.9.5
 
-**8.9.4**
+## 8.9.4
+
 - gitlab: upgrade to CE v8.9.4
 
-**8.9.3**
+## 8.9.3
+
 - gitlab: upgrade to CE v8.9.3
 
-**8.9.2**
+## 8.9.2
+
 - gitlab: upgrade to CE v8.9.2
 
-**8.9.1**
+## 8.9.1
+
 - gitlab: upgrade to CE v8.9.1
 
-**8.9.0**
+## 8.9.0
+
 - gitlab: upgrade to CE v8.9.0
 
-**8.8.5-1**
+## 8.8.5-1
+
 - added GitLab Container Registry support
 - added `SSL_CIPHERS` option to change ciphers of the nginx
 
-**8.8.5**
+## 8.8.5
+
 - gitlab: upgrade to CE v8.8.5
 
-**8.8.4**
+## 8.8.4
+
 - gitlab: upgrade to CE v8.8.4
 - added `GITLAB_PROJECTS_LIMIT` configuration option
 
-**8.8.3**
+## 8.8.3
+
 - gitlab: upgrade to CE v8.8.3
 
-**8.8.2**
+## 8.8.2
+
 - gitlab: upgrade to CE v8.8.2
 
-**8.8.1**
+## 8.8.1
+
 - gitlab: upgrade to CE v8.8.1
 
-**8.8.0**
+## 8.8.0
+
 - gitlab: upgrade to CE v8.8.0
 - oauth: exposed `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` options for users for GitHub Enterprise.
 
-**8.7.6**
+## 8.7.6
+
 - gitlab: upgrade to CE v8.7.6
 
-**8.7.5**
+## 8.7.5
+
 - gitlab: upgrade to CE v8.7.5
 
-**8.7.3**
+## 8.7.3
+
 - gitlab: upgrade to CE v8.7.3
 
-**8.7.2**
+## 8.7.2
+
 - gitlab: upgrade to CE v8.7.2
 
-**8.7.1**
+## 8.7.1
+
 - gitlab: upgrade to CE v8.7.1
 
-**8.7.0**
+## 8.7.0
+
 - gitlab-shell: upgrade to v.2.7.2
 - gitlab: upgrade to CE v8.7.0
 - SSO: `OAUTH_ALLOW_SSO` now specifies a comma separated list of providers.
 - OAuth: Added `OAUTH_EXTERNAL_PROVIDERS` to specify external oauth providers.
 - Exposed `GITLAB_TRUSTED_PROXIES` configuration parameter
 
-**8.6.7**
+## 8.6.7
+
 - added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups
 - gitlab: upgrade to CE v8.6.7
 
-**8.6.6**
+## 8.6.6
+
 - gitlab: upgrade to CE v8.6.6
 
-**8.6.5**
+## 8.6.5
+
 - gitlab: upgrade to CE v8.6.5
 
-**8.6.4**
+## 8.6.4
+
 - gitlab: upgrade to CE v8.6.4
 
-**8.6.3**
+## 8.6.3
+
 - gitlab-shell: upgrade to v.2.6.12
 - gitlab: upgrade to CE v8.6.3
 
-**8.6.2**
+## 8.6.2
+
 - gitlab: upgrade to CE v8.6.2
 
-**8.6.1**
+## 8.6.1
+
 - gitlab: upgrade to CE v8.6.1
 
-**8.6.0**
+## 8.6.0
+
 - gitlab-shell: upgrade to v.2.6.11
 - gitlab-workhorse: upgrade to v0.7.1
 - gitlab: upgrade to CE v8.6.0
 - exposed configuration parameters for auth0 OAUTH support
 - fixed relative_url support
 
-**8.5.8**
+## 8.5.8
+
 - gitlab: upgrade to CE v8.5.8
 
-**8.5.7**
+## 8.5.7
+
 - gitlab: upgrade to CE v8.5.7
 
-**8.5.5**
+## 8.5.5
+
 - gitlab: upgrade to CE v8.5.5
 
-**8.5.4**
+## 8.5.4
+
 - gitlab: upgrade to CE v8.5.4
 
-**8.5.3**
+## 8.5.3
+
 - gitlab: upgrade to CE v8.5.3
 
-**8.5.1**
+## 8.5.1
+
 - gitlab: upgrade to CE v8.5.1
 
-**8.5.0**
+## 8.5.0
+
 - gitlab-workhorse: upgrade to v0.6.4
 - gitlab: upgrade to CE v8.5.0
 - firstrun: expose `GITLAB_ROOT_EMAIL` configuration option
 - expose `OAUTH_AUTO_LINK_SAML_USER` configuration parameter
 
-**8.4.4**
+## 8.4.4
+
 - gitlab: upgrade to CE v8.4.4
 
-**8.4.3**
+## 8.4.3
+
 - gitlab: upgrade to CE v8.4.3
 
-**8.4.2**
+## 8.4.2
+
 - gitlab-workhorse: upgrade to v0.6.2
 - gitlab: upgrade to CE v8.4.2
 
-**8.4.1**
+## 8.4.1
+
 - gitlab: upgrade to CE v8.4.1
 
-**8.4.0-1**
+## 8.4.0-1
+
 - `assets:precompile` moved back to build time
 
-**8.4.0**
+## 8.4.0
+
 - gitlab-shell: upgrade to v.2.6.10
 - gitlab-workhorse: upgrade to v0.6.1
 - gitlab: upgrade to CE v8.4.0
@@ -2549,21 +2976,26 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - oauth: expose azure oauth configuration options
 - `assets:precompile` executed at runtime
 
-**8.3.4**
+## 8.3.4
+
 - gitlab-workhorse: upgrade to v0.5.4
 - gitlab: upgrade to CE v8.3.4
 - expose `LDAP_TIMEOUT` configuration parameter
 
-**8.3.2**
+## 8.3.2
+
 - gitlab: upgrade to CE v8.3.2
 
-**8.3.1**
+## 8.3.1
+
 - gitlab: upgrade to CE v8.3.1
 
-**8.3.0-1**
+## 8.3.0-1
+
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 
-**8.3.0**
+## 8.3.0
+
 - `envsubst` is now used for updating the configurations
 - renamed config `CA_CERTIFICATES_PATH` to `SSL_CA_CERTIFICATES_PATH`
 - renamed config `GITLAB_HTTPS_HSTS_ENABLED` to `NGINX_HSTS_ENABLED`
@@ -2575,28 +3007,33 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - removed `NGINX_MAX_UPLOAD_SIZE` configuration parameter
 - gitlab-shell: upgrade to v.2.6.9
 
-**8.2.3**
+## 8.2.3
+
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 - added `GITLAB_BACKUP_PG_SCHEMA` configuration parameter
 - gitlab: upgrade to CE v8.2.3
 
-**8.2.2**
+## 8.2.2
+
 - added `GITLAB_DOWNLOADS_DIR` configuration parameter
 - `DB_TYPE` parameter renamed to `DB_ADAPTER` with `mysql2` and `postgresql` as accepted values
 - exposed `DB_ENCODING` parameter
 - gitlab: upgrade to CE v8.2.2
 
-**8.2.1-1**
+## 8.2.1-1
+
 - fixed typo while setting the value of `GITLAB_ARTIFACTS_DIR`
 
-**8.2.1**
+## 8.2.1
+
 - expose rack_attack configuration options
 - gitlab-shell: upgrade to v.2.6.8
 - gitlab: upgrade to CE v8.2.1
 - added `GITLAB_ARTIFACTS_ENABLED` configuration parameter
 - added `GITLAB_ARTIFACTS_DIR` configuration parameter
 
-**8.2.0**
+## 8.2.0
+
 - gitlab-shell: upgrade to v.2.6.7
 - gitlab-workhorse: upgrade to v.0.4.2
 - gitlab: upgrade to CE v8.2.0
@@ -2605,54 +3042,68 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added `GITLAB_PROJECTS_BUILDS` configuration parameter
 - added `GITLAB_LFS_ENABLED` configuration parameter
 
-**8.1.4**
+## 8.1.4
+
 - gitlab: upgrade to CE v8.1.4
 
-**8.1.3**
+## 8.1.3
+
 - proper long-term fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - gitlab: upgrade to CE v8.1.3
 - Expose Facebook OAUTH configuration parameters
 
-**8.1.2**
+## 8.1.2
+
 - gitlab: upgrade to CE v8.1.2
 - removed `GITLAB_SATELLITES_TIMEOUT` configuration parameter
 
-**8.1.0-2**
+## 8.1.0-2
+
 - Recompile assets when `GITLAB_RELATIVE_URL_ROOT` is used Fixes #481
 
-**8.1.0-1**
+## 8.1.0-1
+
 - temporary fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 
-**8.1.0**
+## 8.1.0
+
 - gitlab: upgrade to CE v8.1.0
 - gitlab-git-http-server: upgrade to v0.3.0
 
-**8.0.5-1**
+## 8.0.5-1
+
 - speed up container startup by compiling assets at image build time
 - test connection to redis-server
 
-**8.0.5**
+## 8.0.5
+
 - gitlab: upgrade to CE v.8.0.5
 
-**8.0.4-2**
+## 8.0.4-2
+
 - fix http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - allow user to override `OAUTH_ENABLED` setting
 
-**8.0.4-1**
+## 8.0.4-1
+
 - update baseimage to `sameersbn/ubuntu:14.04.20151011`
 
-**8.0.4**
+## 8.0.4
+
 - gitlab: upgrade to CE v.8.0.4
 
-**8.0.3**
+## 8.0.3
+
 - gitlab: upgrade to CE v.8.0.3
 
-**8.0.2**
+## 8.0.2
+
 - gitlab: upgrade to CE v.8.0.2
 - added `IMAP_STARTTLS` parameter, defaults to `false`
 - expose oauth parameters for crowd server
 
-**8.0.0**
+## 8.0.0
+
 - set default value of `DB_TYPE` to `postgres`
 - added sample Kubernetes rc and service description files
 - expose `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` parameter
@@ -2664,102 +3115,129 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - removed `GITLAB_ROBOTS_OVERRIDE` parameter. Override default `robots.txt` if `GITLAB_ROBOTS_PATH` exists.
 - added CI redirection using `GITLAB_CI_HOST` parameter
 
-**7.14.3**
+## 7.14.3
+
 - gitlab: upgrade to CE v.7.14.3
 
-**7.14.2**
+## 7.14.2
+
 - Apply grsecurity policies to nodejs binary #394
 - Fix broken emojis post migration #196
 - gitlab-shell: upgrade to v.2.6.5
 - gitlab: upgrade to CE v.7.14.2
 
-**7.14.1**
+## 7.14.1
+
 - gitlab: upgrade to CE v.7.14.1
 
-**7.14.0**
+## 7.14.0
+
 - gitlab-shell: upgrade to v.2.6.4
 - gitlab: upgrade to CE v.7.14.0
 
-**7.13.5**
+## 7.13.5
+
 - gitlab: upgrade to CE v.7.13.5
 
-**7.13.4**
+## 7.13.4
+
 - gitlab: upgrade to CE v.7.13.4
 
-**7.13.3**
+## 7.13.3
+
 - gitlab: upgrade to CE v.7.13.3
 
-**7.13.2**
+## 7.13.2
+
 - gitlab: upgrade to CE v.7.13.2
 
-**7.13.1**
+## 7.13.1
+
 - gitlab: upgrade to CE v.7.13.1
 
-**7.13.0**
+## 7.13.0
+
 - expose SAML OAuth provider configuration
 - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration
 - gitlab: upgrade to CE v.7.13.0
 
-**7.12.2-2**
+## 7.12.2-2
+
 - enable persistence `.secret` file used in 2FA
 
-**7.12.2-1**
+## 7.12.2-1
+
 - fixed gitlab:backup:restore raketask
 
-**7.12.2**
+## 7.12.2
+
 - gitlab: upgrade to CE v.7.12.2
 
-**7.12.1**
+## 7.12.1
+
 - gitlab: upgrade to CE v.7.12.1
 
-**7.12.0**
+## 7.12.0
+
 - added `SMTP_TLS` configuration parameter
 - gitlab: upgrade to CE v.7.12.0
 - added `OAUTH_AUTO_LINK_LDAP_USER` configuration parameter
 
-**7.11.4-1**
+## 7.11.4-1
+
 - base image update to fix SSL vulnerability
 
-**7.11.4**
+## 7.11.4
+
 - gitlab: upgrade to CE v.7.11.4
 
-**7.11.3**
+## 7.11.3
+
 - gitlab: upgrade to CE v.7.11.3
 
-**7.11.2**
+## 7.11.2
+
 - gitlab: upgrade to CE v.7.11.2
 
-**7.11.0**
+## 7.11.0
+
 - init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option
 - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option
 - gitlab-shell: upgrade to v.2.6.3
 - gitlab: upgrade to CE v.7.11.0
 - init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter
 
-**7.10.4**
+## 7.10.4
+
 - gitlab: upgrade to CE v.7.10.4
 
-**7.10.3**
+## 7.10.3
+
 - gitlab: upgrade to CE v.7.10.3
 
-**7.10.2**
+## 7.10.2
+
 - init: added support for remote AWS backups
 - gitlab: upgrade to CE v.7.10.2
 
-**7.10.1**
+## 7.10.1
+
 - gitlab: upgrade to CE v.7.10.1
 
-**7.10.0**
+## 7.10.0
+
 - gitlab-shell: upgrade to v.2.6.2
 - gitlab: upgrade to CE v.7.10.0
 - init: removed ENV variables to configure *External Issue Tracker* integration
 - init: added `GITLAB_EMAIL_REPLY_TO` configuration option
 - init: added `LDAP_BLOCK_AUTO_CREATED_USERS` configuration option
 
-**7.9.4**
+## 7.9.4
+
 - gitlab: upgrade to CE v.7.9.4
 
-**7.9.3**
+## 7.9.3
+
 - added `NGINX_PROXY_BUFFERING` option
 - added `NGINX_ACCEL_BUFFERING` option
 - added `GITLAB_GRAVATAR_ENABLED` option
@@ -2768,14 +3246,17 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - fixes: "transfer closed with xxx bytes remaining to read" error
 - gitlab: upgrade to CE v.7.9.3
 
-**7.9.2**
+## 7.9.2
+
 - gitlab: upgrade to CE v.7.9.2
 
-**7.9.1**
+## 7.9.1
+
 - init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `none`
 - gitlab: upgrade to CE v.7.9.1
 
-**7.9.0**
+## 7.9.0
+
 - gitlab-shell: upgrade to v.2.6.0
 - gitlab: upgrade to CE v.7.9.0
 - init: set default value of `UNICORN_WORKERS` to `3`
@@ -2784,17 +3265,21 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added BitBucket OAuth configuration support
 - init: added `GITLAB_EMAIL_DISPLAY_NAME` configuration option
 
-**7.8.4**
+## 7.8.4
+
 - gitlab: upgrade to CE v.7.8.4
 
-**7.8.2**
+## 7.8.2
+
 - gitlab: upgrade to CE v.7.8.2
 
-**7.8.1**
+## 7.8.1
+
 - gitlab-shell: upgrade to v.2.5.4
 - gitlab: upgrade to CE v.7.8.1
 
-**7.8.0**
+## 7.8.0
+
 - update postgresql client to the latest version, Closes #249
 - removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui
 - removed `GITLAB_SIGNIN` configuration option, can be set from gitlab ui
@@ -2806,60 +3291,73 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: set `LDAP_METHOD` default value to `plain`
 - init: added gitlab oauth configuration support
 
-**7.7.2**
+## 7.7.2
+
 - gitlab-shell: upgrade to v.2.4.2
 - gitlab: upgrade to CE v.7.7.2
 
-**7.7.1**
+## 7.7.1
+
 - gitlab: upgrade to CE v.7.7.1
 
-**7.7.0**
+## 7.7.0
+
 - init: added GOOGLE_ANALYTICS_ID configuration option
 - added support for mantis issue tracker
 - fixed log rotation configuration
 - gitlab-shell: upgrade to v.2.4.1
 - gitlab: upgrade to CE v.7.7.0
 
-**7.6.2**
+## 7.6.2
+
 - gitlab: upgrade to CE v.7.6.2
 
-**7.6.1**
+## 7.6.1
+
 - disable nginx ipv6 if host does not support it.
 - init: added GITLAB_BACKUP_TIME configuration option
 - gitlab: upgrade to CE v.7.6.1
 
-**7.6.0**
+## 7.6.0
+
 - add support for configuring piwik
 - gitlab-shell: upgrade to v.2.4.0
 - gitlab: upgrade to CE v.7.6.0
 
-**7.5.3**
+## 7.5.3
+
 - accept `BACKUP` parameter while running the restore rake task, closes #220
 - init: do not run `gitlab:satellites:create` rake task at startup
 - gitlab: upgrade to CE v.7.5.3
 
-**7.5.2**
+## 7.5.2
+
 - gitlab: upgrade to CE v.7.5.2
 
-**7.5.1**
+## 7.5.1
+
 - gitlab: upgrade to CE v.7.5.1
 - gitlab-shell to v2.2.0
 - added `GITLAB_TIMEZONE` configuration option
 - added `GITLAB_EMAIL_ENABLED` configuration option
 
-**7.4.4**
+## 7.4.4
+
 - gitlab: upgrade to CE v.7.4.4
 - added `SSL_VERIFY_CLIENT` configuration option
 - added `NGINX_WORKERS` configuration option
 - added `USERMAP_UID` and `USERMAP_GID` configuration option
 
-**7.4.3**
+## 7.4.3
+
 - gitlab: upgrade to CE v.7.4.3
 
-**7.4.2**
+## 7.4.2
+
 - gitlab: upgrade to CE v.7.4.2
 
-**7.4.0**
+## 7.4.0
+
 - gitlab: upgrade to CE v.7.4.0
 - config: added `LDAP_ACTIVE_DIRECTORY` configuration option
 - added SMTP_OPENSSL_VERIFY_MODE configuration option
@@ -2867,10 +3365,12 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - automatically compile assets if relative_url is changed
 - launch all daemons via supervisord
 
-**7.3.2-1**
+## 7.3.2-1
+
 - fix mysql status check
 
-**7.3.2**
+## 7.3.2
+
 - upgrade to gitlab-ce 7.3.2
 - removed internal mysql server
 - added support for fetching `DB_NAME`, `DB_USER` and `DB_PASS` from the postgresql linkage
@@ -2879,27 +3379,33 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added GITLAB_GRAVATAR_ENABLED configuration option
 - added fig.yml
 
-**7.3.1-3**
+## 7.3.1-3
+
 - fix mysql command again!
 
-**7.3.1-2**
+## 7.3.1-2
+
 - fix mysql server status check
 
-**7.3.1-1**
+## 7.3.1-1
+
 - plug bash vulnerability by switching to dash shell
 - automatically run the `gitlab:setup` rake task for new installs
 
-**7.3.1**
+## 7.3.1
+
 - upgrade to gitlab-ce 7.3.1
 
-**7.3.0**
+## 7.3.0
+
 - upgrade to gitlab-ce 7.3.0
 - added GITLAB_WEBHOOK_TIMEOUT configuration option
 - upgrade to gitlab-shell 2.0.0
 - removed internal redis server
 - shutdown the container gracefully
 
-**7.2.2**
+## 7.2.2
+
 - upgrade to gitlab-ce 7.2.2
 - added GITLAB_HTTPS_HSTS_ENABLED configuration option (advanced config)
 - added GITLAB_HTTPS_HSTS_MAXAGE configuration option (advanced config)
@@ -2909,22 +3415,26 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added GITLAB_SSH_HOST configuration option
 - added GITLAB_USERNAME_CHANGE configuration option
 
-**7.2.1-1**
+## 7.2.1-1
+
 - removed the GITLAB_HTTPS_ONLY configuration option
 - added NGINX_X_FORWARDED_PROTO configuration option
 - optimization: talk directly to the unicorn worker from gitlab-shell
 
-**7.2.1**
+## 7.2.1
+
 - upgrade to gitlab-ce 7.2.1
 - added new SMTP_ENABLED configuration option.
 
-**7.2.0-1**
+## 7.2.0-1
+
 - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used.
 - fix relative root access without the trailing '/' character
 - added separate server block for http config in gitlab.https.permissive. Fixes #127
 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option.
 
-**7.2.0**
+## 7.2.0
+
 - upgrade to gitlab-ce 7.2.0
 - update to the sameersbn/ubuntu:14.04.20140818 baseimage
 - remove /var/lib/apt/lists to optimize image size.
@@ -2939,12 +3449,14 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - update to gitlab-shell 1.9.7
 - update to the sameersbn/ubuntu:14.04.20140812 baseimage
 
-**7.1.1**
+## 7.1.1
+
 - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110
 - upgrade to gitlab-ce 7.1.1
 - run /etc/init.d/gitlab as git user, plays nicely with selinux
 
-**7.1.0**
+## 7.1.0
+
 - removed GITLAB_SUPPORT configuration option
 - upgrade to gitlab-ce 7.1.0
 - clone gitlab-ce and gitlab-shell sources from the git repo.
@@ -2953,7 +3465,8 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - no more root access over ssh, use nsenter instead
 - upgrade to nginx-1.6.x series from the nginx/stable ppa
 
-**7.0.0**
+## 7.0.0
+
 - upgrade to gitlab-7.0.0
 - fix repository and gitlab-satellites directory permissions.
 - added GITLAB_RESTRICTED_VISIBILITY configuration option
@@ -2963,18 +3476,22 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - automatically migrate database when gitlab version is updated
 - upgrade to gitlab-shell 1.9.5
 
-**6.9.2**
+## 6.9.2
+
 - upgrade to gitlab-ce 6.9.2
 
-**6.9.1**
+## 6.9.1
+
 - upgrade to gitlab-ce 6.9.1
 
-**6.9.0**
+## 6.9.0
+
 - upgrade to gitlab-ce 6.9.0
 - added GITLAB_RELATIVE_URL_ROOT configuration option
 - added NGINX_MAX_UPLOAD_SIZE configuration to specify the maximum acceptable size of attachments.
 
-**6.8.2**
+## 6.8.2
+
 - upgrade to gitlab-ce 6.8.2
 - renamed configuration option GITLAB_SHELL_SSH_PORT to GITLAB_SSH_PORT
 - added GITLAB_PROJECTS_VISIBILITY configuration option to specify the default project visibility level.
@@ -2995,10 +3512,12 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - cache compiled assets to boost application startup.
 - fix symlink to uploads directory
 
-**6.8.1**
+## 6.8.1
+
 - upgrade to gitlab-ce 6.8.1
 
-**6.8.0**
+## 6.8.0
+
 - upgrade to gitlab-shell 1.9.3
 - added GITLAB_SIGNIN setting to enable or disable standard login form
 - upgraded to gitlab-ce version 6.8.0
@@ -3006,30 +3525,36 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - use sameersbn/ubuntu as the base docker image
 - install postgresql-client to fix restoring backups when used with a postgresql database backend.
 
-**6.7.5**
+## 6.7.5
+
 - upgrade gitlab to 6.7.5
 - support linking to mysql and postgresql containers
 - added DEFAULT_PROJECTS_LIMIT configuration option
 
-**6.7.4**
+## 6.7.4
+
 - upgrade gitlab to 6.7.4
 - added SMTP_AUTHENTICATION configuration option, defaults to :login.
 - added LDAP configuration options.
 
-**6.7.3**
+## 6.7.3
+
 - upgrade gitlab to 6.7.3
 - install ruby2.0 from ppa
 
-**6.7.2**
+## 6.7.2
+
 - upgrade gitlab to 6.7.2
 - upgrade gitlab-shell to 1.9.1
 - reorganize repo
-- do not perform system upgrades (http://crosbymichael.com/dockerfile-best-practices-take-2.html)
+- do not perform system upgrades (<http://crosbymichael.com/dockerfile-best-practices-take-2.html>)
+
+## 6.6.5
 
-**6.6.5**
 - upgraded to gitlab-6.6.5
 
-**v6.6.4**
+## v6.6.4
+
 - upgraded to gitlab-6.6.4
 - added changelog
 - removed postfix mail delivery
@@ -3039,7 +3564,8 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added DB_PORT configuration option
 - changed backup time to 4am (UTC)
 
-**v6.6.2**
+## v6.6.2
+
 - upgraded to gitlab-6.6.2
 - added automated daily/monthly backups feature
 - documented ssh login details for maintenance tasks.
@@ -3048,6 +3574,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added app:rake command for executing gitlab rake tasks
 - documented hardware requirements
 
-**v6.6.1**
+## v6.6.1
+
 - upgraded to gitlabhq-6.6.1
 - reformatted README
diff --git a/Dockerfile b/Dockerfile
index 39e1686fe..e8956ec88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:jammy-20250415.1
+FROM ubuntu:noble-20250415.1
 
-ARG VERSION=17.11.2
+ARG VERSION=18.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
-    RUBYGEMS_VERSION=3.6.8 \
+    RUBYGEMS_VERSION=3.6.9 \
     GOLANG_VERSION=1.24.3 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.11.2 \
-    GITALY_SERVER_VERSION=17.11.2 \
+    GITLAB_PAGES_VERSION=18.0.0 \
+    GITALY_SERVER_VERSION=18.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
@@ -33,15 +33,15 @@ RUN apt-get update \
 RUN set -ex && \
     mkdir -p /etc/apt/keyrings \
  && wget --quiet -O - https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24 | gpg --dearmor -o /etc/apt/keyrings/git-core.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu noble main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \
- && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu jammy nginx" >> /etc/apt/sources.list.d/nginx.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu noble nginx" >> /etc/apt/sources.list.d/nginx.list \
  && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" >> /etc/apt/preferences.d/99nginx \
  && set -ex \
  && apt-get update \
@@ -53,7 +53,6 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \
       libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev \
       libcurl4-openssl-dev libicu-dev libkrb5-dev rsync python3-docutils pkg-config cmake \
-      runit-systemd \
       tzdata unzip libimage-exiftool-perl libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
@@ -85,8 +84,6 @@ LABEL \
 
 EXPOSE 22/tcp 80/tcp 443/tcp
 
-RUN ln -s /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem
-
 VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"]
 WORKDIR ${GITLAB_INSTALL_DIR}
 ENTRYPOINT ["/sbin/entrypoint.sh"]
diff --git a/README.md b/README.md
index bd02a05c7..baa4a6d6d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.11.2
+# sameersbn/gitlab:18.0.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -175,7 +175,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm,btree_gist' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:14-20230628
+    kkimurak/sameersbn-postgresql:16
 ```
 
 Step 2. Launch a redis container
@@ -183,7 +183,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 Step 3. Launch the gitlab container
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 ### Database
@@ -254,10 +254,10 @@ This behavior can be checked using the command `docker logs` and an output like
 …
 Configuring gitlab::database
 - Installing postgresql client to avoid version mismatch on dumping
--- Detected server version: 140007
+-- Detected server version: 160009
 - Generating /home/git/.postgresqlrc
-14 postgresql:5432 gitlabhq_production
-- Uninstalling unused client(s): postgresql-client-12 postgresql-client-13 postgresql-client-15
+16 postgresql:5432 gitlabhq_production
+- Uninstalling unused client(s): postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-17
 …
 ````
 
@@ -265,10 +265,16 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 
 - `postgresql-client-13`,
 - `postgresql-client-14`,
-- `postgresql-client-15`.
-- and `postgresql-client-16`.
+- `postgresql-client-15`,
+- `postgresql-client-16`,
+- and `postgresql-client-17`.
 
-*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x.
+***Notes:***
+
+- GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
+- GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
+- GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
+- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 
@@ -292,7 +298,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -306,7 +312,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, let's pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:14-20230628
+docker pull kkimurak/sameersbn-postgresql:16
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -326,7 +332,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:14-20230628
+    kkimurak/sameersbn-postgresql:16
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -336,15 +342,14 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
 
-- [postgres](https://hub.docker.com/_/postgres/)
-- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
-- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
-- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
+- [postgres](https://hub.docker.com/_/postgres/),
+- [kkimurak/sameersbn-postgresql](https://hub.docker.com/r/kkimurak/sameersbn-postgresql), or
+- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) .
 
 ##### Upgrading PostgreSQL
 
@@ -375,7 +380,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 #### Linking to Redis Container
@@ -387,7 +392,7 @@ To illustrate linking with a redis container, we will use the [redis](https://gi
 First, let's pull the redis image from the docker index.
 
 ```bash
-docker pull redis:6.2
+docker pull redis:7
 ```
 
 Lets start the redis container
@@ -395,14 +400,14 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 #### Mail
@@ -415,7 +420,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +440,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +524,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +540,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.11.2
+ sameersbn/gitlab:18.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +563,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +611,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +817,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:sanitize
+    sameersbn/gitlab:18.0.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2567,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2602,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake db:setup
+    sameersbn/gitlab:18.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2618,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2667,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2680,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2711,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2720,9 +2725,16 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
+> If you're using `sameersbn/postgresql` then please upgrade to `kkimurak/sameersbn-postgresql:16` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
+>
+> Please keep in mind that:
+>
+> - As of version 13.7.0, the required PostgreSQL version is 12.x.
+> - As of version 16.0.0, the required PostgreSQL version is 13.x.
+> - As of version 17.0.0, the required PostgreSQL version is 14.x.
+> - As of version 18.0.0, the required PostgreSQL version is 16.x.
 >
-> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
+> If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 
@@ -2730,12 +2742,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2773,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.0
 ```
 
 ### Shell Access
@@ -2799,7 +2811,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 867f790a8..7eae4e2e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.11.2
+18.0.0
diff --git a/assets/build/install.sh b/assets/build/install.sh
index e76c823f0..d9826c41d 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -19,7 +19,9 @@ PATH=${GOROOT}/bin:$PATH
 
 export GOROOT PATH
 
-BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
+# TODO Verify, if this is necessary or not.
+# BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
+BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake \
   libc6-dev \
   libpq-dev zlib1g-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
@@ -59,19 +61,22 @@ cd "$PWD_ORG" && rm -rf /tmp/ruby
 # upgrade rubygems on demand
 gem update --no-document --system "${RUBYGEMS_VERSION}"
 
-# PaX-mark ruby
-# Applying the mark late here does make the build usable on PaX kernels, but
-# still the build itself must be executed on a non-PaX kernel. It's done here
-# only for simplicity.
-paxctl -cvm "$(command -v ruby)"
-# https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
-paxctl -cvm "$(command -v node)"
+# TODO Verify, if this is necessary or not.
+# # PaX-mark ruby
+# # Applying the mark late here does make the build usable on PaX kernels, but
+# # still the build itself must be executed on a non-PaX kernel. It's done here
+# # only for simplicity.
+# paxctl -cvm "$(command -v ruby)"
+# # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
+# paxctl -cvm "$(command -v node)"
 
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
 
 # add ${GITLAB_USER} user
-adduser --disabled-login --gecos 'GitLab' ${GITLAB_USER}
+deluser --remove-home ubuntu
+addgroup --gid 1000 git
+adduser --uid 1000 --gid 1000 --disabled-password --gecos 'GitLab' ${GITLAB_USER}
 passwd -d ${GITLAB_USER}
 
 # set PATH (fixes cron job PATH issues)
@@ -212,7 +217,7 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 exec_as_git yarn install --production --pure-lockfile
 
 echo "Compiling assets. Please be patient, this could take a while..."
-exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096"
+exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=8192"
 
 # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml
 rm -rf ${GITLAB_DATA_DIR}/config/secrets.yml
diff --git a/assets/runtime/functions b/assets/runtime/functions
index b32048fb8..de90c30a2 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2260,7 +2260,7 @@ migrate_database() {
       chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
       exec_as_git yarn install --production --pure-lockfile
       echo "Recompiling assets (relative_url in use), this could take a while..."
-      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
+      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1
     fi
 
     echo "Clearing cache..."
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5b58b0dbc..ca6b49145 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,175 +3,175 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - /srv/docker/gitlab/redis:/var/lib/redis:Z
+      - /srv/docker/gitlab/redis:/var/lib/redis:Z
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
-    - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
+      - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - /srv/docker/gitlab/gitlab:/home/git/data:Z
+      - /srv/docker/gitlab/gitlab:/home/git/data:Z
     configs:
       - gitlab-configs
     secrets:
       - gitlab-secrets
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=localhost
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-    - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH2_GENERIC_APP_ID=
-    - OAUTH2_GENERIC_APP_SECRET=
-    - OAUTH2_GENERIC_CLIENT_SITE=
-    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=
-    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=
-    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=
-    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=
-    - OAUTH2_GENERIC_ID_PATH=
-    - OAUTH2_GENERIC_USER_UID=
-    - OAUTH2_GENERIC_USER_NAME=
-    - OAUTH2_GENERIC_USER_EMAIL=
-    - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=
-    - OAUTH2_GENERIC_LABEL=
-    - OAUTH2_GENERIC_NAME=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=localhost
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+      - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH2_GENERIC_APP_ID=
+      - OAUTH2_GENERIC_APP_SECRET=
+      - OAUTH2_GENERIC_CLIENT_SITE=
+      - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=
+      - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=
+      - OAUTH2_GENERIC_CLIENT_TOKEN_URL=
+      - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=
+      - OAUTH2_GENERIC_ID_PATH=
+      - OAUTH2_GENERIC_USER_UID=
+      - OAUTH2_GENERIC_USER_NAME=
+      - OAUTH2_GENERIC_USER_EMAIL=
+      - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=
+      - OAUTH2_GENERIC_LABEL=
+      - OAUTH2_GENERIC_NAME=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
 
 configs:
   gitlab-configs:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 171536157..d33d1dbfc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,25 +1,25 @@
 version: '3.4'
 services:
   redis:
-    image: redis:6.2
+    image: redis:7
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/var/lib/redis:Z
+      - redis-data:/var/lib/redis:Z
     deploy:
       placement:
         constraints:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
     deploy:
       placement:
         constraints:
@@ -63,10 +63,10 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
       # Listen on port 22, default for SSH and Git in host mode (only in its host)
       # So other nodes in the cluster can keep listening on port 22
@@ -74,8 +74,8 @@ services:
         published: 22
         mode: host
     volumes:
-    - gitlab-data:/home/git/data:Z
-    - certs-data:/certs
+      - gitlab-data:/home/git/data:Z
+      - certs-data:/certs
     # healthcheck:
     #   test: ["CMD", "/usr/local/sbin/healthcheck"]
     #   interval: 5m
@@ -88,138 +88,138 @@ services:
       # To be available for the public Traefik
       - traefik-public
     environment:
-    - DEBUG=false
-
-    - GITLAB_REGISTRY_ENABLED=true
-    - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
-    - GITLAB_REGISTRY_PORT=443
-    - GITLAB_REGISTRY_API_URL=http://registry:5000
-    - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
-    - GITLAB_REGISTRY_ISSUER=gitlab-issuer
-    - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
-
-    - GITLAB_SIGNUP_ENABLED=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=true
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=${GITLAB_HOST?Variable not set}
-    - GITLAB_PORT=443
-    - GITLAB_SSH_PORT=22
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
-
-    - RACK_ATTACK_ENABLED=false
+      - DEBUG=false
+
+      - GITLAB_REGISTRY_ENABLED=true
+      - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
+      - GITLAB_REGISTRY_PORT=443
+      - GITLAB_REGISTRY_API_URL=http://registry:5000
+      - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
+      - GITLAB_REGISTRY_ISSUER=gitlab-issuer
+      - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
+
+      - GITLAB_SIGNUP_ENABLED=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=true
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=${GITLAB_HOST?Variable not set}
+      - GITLAB_PORT=443
+      - GITLAB_SSH_PORT=22
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
+
+      - RACK_ATTACK_ENABLED=false
     deploy:
       placement:
         constraints:
diff --git a/docker-compose.yml b/docker-compose.yml
index e9687f94a..2ec91a1c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,34 +3,34 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/data:Z
+      - redis-data:/data:Z
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - gitlab-data:/home/git/data:Z
+      - gitlab-data:/home/git/data:Z
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 5m
@@ -38,125 +38,125 @@ services:
       retries: 3
       start_period: 5m
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=localhost
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=localhost
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
 
 volumes:
   redis-data:
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 13aa87afd..66c6f5877 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -1,24 +1,32 @@
-GitLab Container Registry
-=========================
+# GitLab Container Registry
+
 Since `8.8.0` GitLab introduces a container registry. GitLab is helping to authenticate the user against the registry and proxy it via Nginx. By [Registry](https://docs.docker.com/registry) we mean the registry from docker whereas *Container Registry* is the feature in GitLab.
 
-- [Prerequisites](#prerequisites)
-- [Installation](#installation)
-- [Configuration](#configuration)
-- [Maintenance](#maintenance)
+- [GitLab Container Registry](#gitlab-container-registry)
+  - [Prerequisites](#prerequisites)
+  - [Installation](#installation)
+    - [Setup with Nginx as Reverse Proxy](#setup-with-nginx-as-reverse-proxy)
+      - [Create auth tokens](#create-auth-tokens)
+      - [Update docker-compose.yml](#update-docker-composeyml)
+      - [Nginx Site Configuration](#nginx-site-configuration)
+  - [Configuration](#configuration)
+    - [Available Parameters](#available-parameters)
+    - [Container Registry storage driver](#container-registry-storage-driver)
+      - [Example for Amazon Simple Storage Service (s3)](#example-for-amazon-simple-storage-service-s3)
+    - [Storage limitations](#storage-limitations)
+  - [Maintenance](#maintenance)
     - [Creating Backups](#creating-backups)
     - [Restoring Backups](#restoring-backups)
-- [Upgrading from an existing GitLab instance](#Upgrading-from-an-existing-GitLab-instance)
-
-# Prerequisites
+  - [Upgrading from an existing GitLab installation](#upgrading-from-an-existing-gitlab-installation)
 
-  - [Docker Distribution](https://github.com/docker/distribution) >= 2.4
-  - [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1
+## Prerequisites
 
+- [Docker Distribution](https://github.com/docker/distribution) >= 2.4
+- [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1
 
-# Installation
+## Installation
 
-## Setup with Nginx as Reverse Proxy
+### Setup with Nginx as Reverse Proxy
 
 We assume that you already have Nginx installed on your host system and that
 you use a reverse proxy configuration to connect to your GitLab container.
@@ -26,13 +34,13 @@ you use a reverse proxy configuration to connect to your GitLab container.
 In this example we use a dedicated domain for the registry. The URLs for
 the GitLab installation and the registry are:
 
-* git.example.com
-* registry.example.com
+- git.example.com
+- registry.example.com
 
 > Note: You could also run everything on the same domain and use different ports
 > instead. The required configuration changes below should be straightforward.
 
-### Create auth tokens
+#### Create auth tokens
 
 GitLab needs a certificate ("auth token") to talk to the registry API. The
 tokens must be provided in the `/certs` directory of your container. You could
@@ -55,8 +63,7 @@ openssl x509 -in registry.csr -out registry.crt -req -signkey registry.key -days
 It doesn't matter which details (domain name, etc.) you enter during key
 creation. This information is not used at all.
 
-
-### Update docker-compose.yml
+#### Update docker-compose.yml
 
 First add the configuration for the registry container to your `docker-compose.yml`.
 
@@ -108,7 +115,7 @@ Then update the `volumes` and `environment` sections of your `gitlab` container:
             - ./certs:/certs
 ```
 
-### Nginx Site Configuration
+#### Nginx Site Configuration
 
 ```nginx
 server {
@@ -150,9 +157,9 @@ server {
 }
 ```
 
-# Configuration
+## Configuration
 
-## Available Parameters
+### Available Parameters
 
 Here is an example of all configuration parameters that can be used in the GitLab container.
 
@@ -174,15 +181,15 @@ where:
 
 | Parameter | Description |
 | --------- | ----------- |
-| `GITLAB_REGISTRY_ENABLED ` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. |
-| `GITLAB_REGISTRY_HOST `    | The host URL under which the Registry will run and the users will be able to use. |
-| `GITLAB_REGISTRY_PORT `    | The port under which the external Registry domain will listen on. |
-| `GITLAB_REGISTRY_API_URL ` | The internal API URL under which the Registry is exposed to. |
-| `GITLAB_REGISTRY_KEY_PATH `| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
-| `GITLAB_REGISTRY_PATH `    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
+| `GITLAB_REGISTRY_ENABLED` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. |
+| `GITLAB_REGISTRY_HOST`    | The host URL under which the Registry will run and the users will be able to use. |
+| `GITLAB_REGISTRY_PORT`    | The port under which the external Registry domain will listen on. |
+| `GITLAB_REGISTRY_API_URL` | The internal API URL under which the Registry is exposed to. |
+| `GITLAB_REGISTRY_KEY_PATH`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
+| `GITLAB_REGISTRY_PATH`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
 | `GITLAB_REGISTRY_ISSUER`  | This should be the same value as configured in Registry's `issuer`. Otherwise the authentication will not work. For more info read the [token auth configuration documentation][token-config]. |
-| `SSL_REGISTRY_KEY_PATH `    | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. |
-| `SSL_REGISTRY_CERT_PATH `    | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. |
+| `SSL_REGISTRY_KEY_PATH`    | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. |
+| `SSL_REGISTRY_CERT_PATH`    | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. |
 
 For more info look at [Available Configuration Parameters](https://github.com/sameersbn/docker-gitlab#available-configuration-parameters).
 
@@ -200,12 +207,9 @@ gitlab:
 ...
 ```
 
-## Container Registry storage driver
+### Container Registry storage driver
 
-You can configure the Container Registry to use a different storage backend by
-configuring a different storage driver. By default the GitLab Container Registry
-is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path)
-configuration. These configurations will all be done in the registry container.
+You can configure the Container Registry to use a different storage backend by configuring a different storage driver. By default the GitLab Container Registry is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path) configuration. These configurations will all be done in the registry container.
 
 The different supported drivers are:
 
@@ -227,7 +231,7 @@ Read more about the individual driver's config options in the
 > If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be separated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted separated the whole restoring process of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail.
 > An example how it works is in the `docker-compose`.
 
-### Example for Amazon Simple Storage Service (s3)
+#### Example for Amazon Simple Storage Service (s3)
 
 If you want to configure your registry via `/etc/docker/registry/config.yml` your storage part should like this snippet below.
 
@@ -243,8 +247,6 @@ storage:
     enabled: true
 ```
 
-
-
 ```yaml
  ...
  registry:
@@ -267,18 +269,17 @@ storage:
 
 Generally for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration).
 
-
-## Storage limitations
+### Storage limitations
 
 Currently, there is no storage limitation, which means a user can upload an
 infinite amount of Docker images with arbitrary sizes. This setting will be
 configurable in future releases.
 
+## Maintenance
 
-# Maintenance
 If you use another storage configuration than filesystem it will have no impact on your Maintenance workflow.
 
-## Creating Backups
+### Creating Backups
 
 Creating Backups is the same like without a container registry. I would recommend to stop your registry container.
 
@@ -287,11 +288,13 @@ docker stop registry gitlab && docker rm registry gitlab
 ```
 
 Execute the rake task with a removeable container.
+
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
 ```
-## Restoring Backups
+
+### Restoring Backups
 
 GitLab also defines a rake task to restore a backup.
 
@@ -305,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,18 +317,17 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
-# Upgrading from an existing GitLab installation
-
+## Upgrading from an existing GitLab installation
 
 If you want enable this feature for an existing instance of GitLab you need to do the following steps.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -365,6 +367,7 @@ docker run --name registry -d \
 --env 'REGISTRY_STORAGE_DELETE_ENABLED=true' \
 registry:2.4.1
 ```
+
 - **Step 6**: Start the image
 
 ```bash
@@ -378,14 +381,8 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.11.2
+sameersbn/gitlab:18.0.0
 ```
 
-
-[wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate
-[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040
-[docker-insecure]: https://docs.docker.com/registry/insecure/
-[registry-deploy]: https://docs.docker.com/registry/deploying/
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
 [token-config]: https://docs.docker.com/registry/configuration/#token
-[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5314cf72a..e7e45e867 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,178 +3,178 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/var/lib/redis:Z
+      - redis-data:/var/lib/redis:Z
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - gitlab-data:/home/git/data:Z
+      - gitlab-data:/home/git/data:Z
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST='<your-ip-address>'
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=<root-password>
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=true
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
-    - OAUTH_ALLOW_SSO=Keycloak
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=false
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=Keycloak
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
-
-    - OAUTH2_GENERIC_APP_ID=git
-    - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
-    - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
-    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
-    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
-    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
-    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
-    - OAUTH2_GENERIC_ID_PATH=sub
-    - OAUTH2_GENERIC_USER_UID=sub
-    - OAUTH2_GENERIC_USER_NAME=preferred_username
-    - OAUTH2_GENERIC_USER_EMAIL=email
-    - OAUTH2_GENERIC_NAME=Keycloak
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST='<your-ip-address>'
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=<root-password>
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=true
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
+      - OAUTH_ALLOW_SSO=Keycloak
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=false
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=Keycloak
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
+
+      - OAUTH2_GENERIC_APP_ID=git
+      - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
+      - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
+      - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
+      - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
+      - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
+      - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
+      - OAUTH2_GENERIC_ID_PATH=sub
+      - OAUTH2_GENERIC_USER_UID=sub
+      - OAUTH2_GENERIC_USER_NAME=preferred_username
+      - OAUTH2_GENERIC_USER_EMAIL=email
+      - OAUTH2_GENERIC_NAME=Keycloak
 
   keycloak:
     restart: always
     image: jboss/keycloak:8.0.1
     ports:
-    - "10081:8080"
+      - "10081:8080"
     environment:
-    - DEBUG=false
-    - KEYCLOAK_PASSWORD=admin
-    - KEYCLOAK_USER=admin
+      - DEBUG=false
+      - KEYCLOAK_PASSWORD=admin
+      - KEYCLOAK_USER=admin
 
 volumes:
   redis-data:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f86f9b29b..2dbd1a3ff 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,91 +3,91 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis:/var/lib/redis:Z
+      - redis:/var/lib/redis:Z
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
-    - postgresql:/var/lib/postgresql:Z
+      - postgresql:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     volumes:
-    - gitlab-data:/home/git/data:Z
-    - gitlab-logs:/var/log/gitlab
-    - ./certs:/certs
+      - gitlab-data:/home/git/data:Z
+      - gitlab-logs:/var/log/gitlab
+      - ./certs:/certs
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "80:80"
-    - "10022:22"
+      - "80:80"
+      - "10022:22"
     external_links:
-    - "registry:registry.example.com"
+      - "registry:registry.example.com"
     environment:
-    - DEBUG=false
+      - DEBUG=false
 
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
 
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
 
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
 
-    - GITLAB_HOST=gitlab.example.com
-    - GITLAB_PORT=80
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=secret
-    - GITLAB_SECRETS_SECRET_KEY_BASE=secret
-    - GITLAB_SECRETS_OTP_KEY_BASE=secret
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret
+      - GITLAB_HOST=gitlab.example.com
+      - GITLAB_PORT=80
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=secret
+      - GITLAB_SECRETS_SECRET_KEY_BASE=secret
+      - GITLAB_SECRETS_OTP_KEY_BASE=secret
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret
 
-    - GITLAB_REGISTRY_ENABLED=true
-    - GITLAB_REGISTRY_HOST=registry.example.com
-    - GITLAB_REGISTRY_PORT=5000
-    - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000
-    - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt
-    - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key
+      - GITLAB_REGISTRY_ENABLED=true
+      - GITLAB_REGISTRY_HOST=registry.example.com
+      - GITLAB_REGISTRY_PORT=5000
+      - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000
+      - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt
+      - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key
 
   registry:
     restart: always
     image: registry:2.4.1
     ports:
-    - "5000:5000"
+      - "5000:5000"
     volumes:
-    - registry-data:/var/lib/registry
-    - ./certs:/certs
+      - registry-data:/var/lib/registry
+      - ./certs:/certs
     external_links:
-    - "gitlab:gitlab.example.com"
+      - "gitlab:gitlab.example.com"
     environment:
-    - REGISTRY_LOG_LEVEL=info
-    - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry
-    - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth
-    - REGISTRY_AUTH_TOKEN_SERVICE=container_registry
-    - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
-    - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt
-    - REGISTRY_STORAGE_DELETE_ENABLED=true
-    - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt
-    - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key
-    - REGISTRY_HTTP_SECRET=secret
+      - REGISTRY_LOG_LEVEL=info
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry
+      - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth
+      - REGISTRY_AUTH_TOKEN_SERVICE=container_registry
+      - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
+      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt
+      - REGISTRY_STORAGE_DELETE_ENABLED=true
+      - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt
+      - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key
+      - REGISTRY_HTTP_SECRET=secret
 
 volumes:
     gitlab-data:
diff --git a/docs/exposing-ssh-port.md b/docs/exposing-ssh-port.md
index 9c37baee6..a2dbca10a 100644
--- a/docs/exposing-ssh-port.md
+++ b/docs/exposing-ssh-port.md
@@ -3,6 +3,5 @@
 This is how to expose this internal ssh port without affecting the existing ssh port on the host server:
 
 * use this configuration script: [`../contrib/expose-gitlab-ssh-port.sh`](../contrib/expose-gitlab-ssh-port.sh)
-* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test
-](https://github.com/harobed/docker-gitlab-vagrant-test)
+* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test](https://github.com/harobed/docker-gitlab-vagrant-test)
 * more information, see [« Exposing ssh port in dockerized gitlab-ce »](https://blog.xiaket.org/2017/exposing.ssh.port.in.dockerized.gitlab-ce.html) post
diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 61f76ce65..04bc3c734 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -37,7 +37,7 @@ Set the following in the docker-compose file:
     - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
 ```
 
-`<your-ip-address>` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `<your-ip-address>` would be different as would the port and the realm. 
+`<your-ip-address>` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `<your-ip-address>` would be different as would the port and the realm.
 
 The following must also be configured:
 
@@ -47,7 +47,7 @@ The following must also be configured:
     - OAUTH2_GENERIC_USER_EMAIL='email'    
 ```
 
-The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. 
+The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure.
 
 Also, make sure the following variables are filled in the docker-compose file:
 
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index ed815750e..4fb7d0fb3 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -1,24 +1,22 @@
-GitLab Backup to s3 compatible storage
-=================================================
+# GitLab Backup to s3 compatible storage
 
-Enables automatic backups to self-hosted s3 compatible storage like minio (https://minio.io/) and others.
+Enables automatic backups to self-hosted s3 compatible storage like minio (<https://minio.io/>) and others.
 This is an extend of AWS Remote Backups.
 
 As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
 
-
-- [Available Parameters](#available-parameters)
-- [Installation](#installation)
-- [Maintenance](#maintenance)
+- [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage)
+  - [Available Parameters](#available-parameters)
+  - [Installation](#installation)
+    - [Docker Compose](#docker-compose)
     - [Creating Backups](#creating-backups)
     - [Restoring Backups](#restoring-backups)
 
-
-# Available Parameters
+## Available Parameters
 
 Here is an example of all configuration parameters that can be used in the GitLab container.
 
-```
+```yaml
 ...
 gitlab:
     ...
@@ -29,7 +27,6 @@ gitlab:
     - AWS_BACKUP_SECRET_ACCESS_KEY=minio123
     - AWS_BACKUP_BUCKET=docker
     - AWS_BACKUP_MULTIPART_CHUNK_SIZE=104857600
-
 ```
 
 where:
@@ -47,7 +44,7 @@ For more info look at [Available Configuration Parameters](https://github.com/sa
 
 A minimum set of these parameters are required to use the s3 compatible storage:
 
-```yml
+```yaml
 ...
 gitlab:
     environment:
@@ -58,11 +55,12 @@ gitlab:
     - AWS_BACKUP_BUCKET=docker
 ...
 ```
-# Installation
+
+## Installation
 
 Starting a fresh installation with GitLab would be like the `docker-compose` file.
 
-## Docker Compose
+### Docker Compose
 
 This is an example with minio.
 
@@ -72,7 +70,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:6.2
+    image: sameersbn/redis:7
     command:
     - --loglevel warning
     volumes:
@@ -215,15 +213,16 @@ services:
     command: server /export
 ```
 
-
-## Creating Backups
+### Creating Backups
 
 Execute the rake task with a removeable container.
+
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:8.16.4 app:rake gitlab:backup:create
 ```
-## Restoring Backups
+
+### Restoring Backups
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c47ce2e61..75988d916 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.11.2
+        image: sameersbn/gitlab:18.0.0
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index 9498d28b0..e6c4adbb3 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:14-20230628
+        image: kkimurak/sameersbn-postgresql:16
         env:
         - name: DB_USER
           value: gitlab
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index b42b387b4..0c7991d65 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: redis:6.2
+        image: redis:7
         ports:
         - name: redis
           containerPort: 6379
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 418a6dcf4..db67c17fd 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -41,8 +41,10 @@ Please note that this version does not yet include any rework as a consequence o
 Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance!
 
 Please note:
-- GitLab 17.x requires at least PostgreSQL 14.
-- See issues to be aware of when upgrading to 17.x : <https://docs.gitlab.com/ee/update/versions/gitlab_17_changes.html>
+
+- Before upgrading to GitLab 18 make sure to read and understand the [notes about breaking changes](https://about.gitlab.com/blog/2025/04/18/a-guide-to-the-breaking-changes-in-gitlab-18-0/).
+- In GitLab 18.0 and later, [PostgreSQL 16 or later is required](https://docs.gitlab.com/install/installation/#software-requirements).
+- See issues to be aware of when upgrading: <https://docs.gitlab.com/update/>.
 
 ## Contributing