diff --git a/README.md b/README.md
index efeff910..50cfefba 100644
--- a/README.md
+++ b/README.md
@@ -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
@@ -306,7 +306,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 +326,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.
@@ -2720,7 +2720,7 @@ 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>).
 >
 > 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).
 
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 21900a08..8fb66cb3 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ce615cb2..7f8c742d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2eca3b67..8864abbc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index eea284f8..12dea678 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 49dbc1d5..d8a5b876 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index 9498d28b..e6c4adbb 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