diff --git a/14/alpine3.21/Dockerfile b/14/alpine3.23/Dockerfile
similarity index 99%
rename from 14/alpine3.21/Dockerfile
rename to 14/alpine3.23/Dockerfile
index 97cf72820e..818ed90b05 100644
--- a/14/alpine3.21/Dockerfile
+++ b/14/alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.21
+FROM alpine:3.23
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
diff --git a/14/alpine3.21/docker-ensure-initdb.sh b/14/alpine3.23/docker-ensure-initdb.sh
similarity index 100%
rename from 14/alpine3.21/docker-ensure-initdb.sh
rename to 14/alpine3.23/docker-ensure-initdb.sh
diff --git a/14/alpine3.21/docker-entrypoint.sh b/14/alpine3.23/docker-entrypoint.sh
similarity index 100%
rename from 14/alpine3.21/docker-entrypoint.sh
rename to 14/alpine3.23/docker-entrypoint.sh
diff --git a/15/alpine3.21/Dockerfile b/15/alpine3.23/Dockerfile
similarity index 99%
rename from 15/alpine3.21/Dockerfile
rename to 15/alpine3.23/Dockerfile
index 1e0fcad2eb..ba3e564b0e 100644
--- a/15/alpine3.21/Dockerfile
+++ b/15/alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.21
+FROM alpine:3.23
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
diff --git a/15/alpine3.21/docker-ensure-initdb.sh b/15/alpine3.23/docker-ensure-initdb.sh
similarity index 100%
rename from 15/alpine3.21/docker-ensure-initdb.sh
rename to 15/alpine3.23/docker-ensure-initdb.sh
diff --git a/15/alpine3.21/docker-entrypoint.sh b/15/alpine3.23/docker-entrypoint.sh
similarity index 100%
rename from 15/alpine3.21/docker-entrypoint.sh
rename to 15/alpine3.23/docker-entrypoint.sh
diff --git a/16/alpine3.21/Dockerfile b/16/alpine3.23/Dockerfile
similarity index 99%
rename from 16/alpine3.21/Dockerfile
rename to 16/alpine3.23/Dockerfile
index 7c98a1bbc7..d58865524c 100644
--- a/16/alpine3.21/Dockerfile
+++ b/16/alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.21
+FROM alpine:3.23
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
diff --git a/16/alpine3.21/docker-ensure-initdb.sh b/16/alpine3.23/docker-ensure-initdb.sh
similarity index 100%
rename from 16/alpine3.21/docker-ensure-initdb.sh
rename to 16/alpine3.23/docker-ensure-initdb.sh
diff --git a/16/alpine3.21/docker-entrypoint.sh b/16/alpine3.23/docker-entrypoint.sh
similarity index 100%
rename from 16/alpine3.21/docker-entrypoint.sh
rename to 16/alpine3.23/docker-entrypoint.sh
diff --git a/17/alpine3.21/Dockerfile b/17/alpine3.23/Dockerfile
similarity index 99%
rename from 17/alpine3.21/Dockerfile
rename to 17/alpine3.23/Dockerfile
index 77bce78a30..b5ace65f2a 100644
--- a/17/alpine3.21/Dockerfile
+++ b/17/alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.21
+FROM alpine:3.23
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
diff --git a/17/alpine3.21/docker-ensure-initdb.sh b/17/alpine3.23/docker-ensure-initdb.sh
similarity index 100%
rename from 17/alpine3.21/docker-ensure-initdb.sh
rename to 17/alpine3.23/docker-ensure-initdb.sh
diff --git a/17/alpine3.21/docker-entrypoint.sh b/17/alpine3.23/docker-entrypoint.sh
similarity index 100%
rename from 17/alpine3.21/docker-entrypoint.sh
rename to 17/alpine3.23/docker-entrypoint.sh
diff --git a/18/alpine3.21/Dockerfile b/18/alpine3.23/Dockerfile
similarity index 99%
rename from 18/alpine3.21/Dockerfile
rename to 18/alpine3.23/Dockerfile
index 7f5d433e03..47a31f6a20 100644
--- a/18/alpine3.21/Dockerfile
+++ b/18/alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.21
+FROM alpine:3.23
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
diff --git a/18/alpine3.21/docker-ensure-initdb.sh b/18/alpine3.23/docker-ensure-initdb.sh
similarity index 100%
rename from 18/alpine3.21/docker-ensure-initdb.sh
rename to 18/alpine3.23/docker-ensure-initdb.sh
diff --git a/18/alpine3.21/docker-entrypoint.sh b/18/alpine3.23/docker-entrypoint.sh
similarity index 100%
rename from 18/alpine3.21/docker-entrypoint.sh
rename to 18/alpine3.23/docker-entrypoint.sh
diff --git a/versions.json b/versions.json
index daed831363..4d14db0c45 100644
--- a/versions.json
+++ b/versions.json
@@ -1,6 +1,6 @@
 {
   "18": {
-    "alpine": "3.22",
+    "alpine": "3.23",
     "debian": "trixie",
     "trixie": {
       "version": "18.1-1.pgdg13+2",
@@ -13,8 +13,8 @@
     "variants": [
       "trixie",
       "bookworm",
-      "alpine3.22",
-      "alpine3.21"
+      "alpine3.23",
+      "alpine3.22"
     ],
     "bookworm": {
       "version": "18.1-1.pgdg12+2",
@@ -29,7 +29,7 @@
     "major": 18
   },
   "17": {
-    "alpine": "3.22",
+    "alpine": "3.23",
     "debian": "trixie",
     "trixie": {
       "version": "17.7-3.pgdg13+1",
@@ -42,8 +42,8 @@
     "variants": [
       "trixie",
       "bookworm",
-      "alpine3.22",
-      "alpine3.21"
+      "alpine3.23",
+      "alpine3.22"
     ],
     "bookworm": {
       "version": "17.7-3.pgdg12+1",
@@ -58,7 +58,7 @@
     "major": 17
   },
   "16": {
-    "alpine": "3.22",
+    "alpine": "3.23",
     "debian": "trixie",
     "trixie": {
       "version": "16.11-1.pgdg13+1",
@@ -71,8 +71,8 @@
     "variants": [
       "trixie",
       "bookworm",
-      "alpine3.22",
-      "alpine3.21"
+      "alpine3.23",
+      "alpine3.22"
     ],
     "bookworm": {
       "version": "16.11-1.pgdg12+1",
@@ -87,7 +87,7 @@
     "major": 16
   },
   "15": {
-    "alpine": "3.22",
+    "alpine": "3.23",
     "debian": "trixie",
     "trixie": {
       "version": "15.15-1.pgdg13+1",
@@ -100,8 +100,8 @@
     "variants": [
       "trixie",
       "bookworm",
-      "alpine3.22",
-      "alpine3.21"
+      "alpine3.23",
+      "alpine3.22"
     ],
     "bookworm": {
       "version": "15.15-1.pgdg12+1",
@@ -116,7 +116,7 @@
     "major": 15
   },
   "14": {
-    "alpine": "3.22",
+    "alpine": "3.23",
     "debian": "trixie",
     "trixie": {
       "version": "14.20-1.pgdg13+1",
@@ -129,8 +129,8 @@
     "variants": [
       "trixie",
       "bookworm",
-      "alpine3.22",
-      "alpine3.21"
+      "alpine3.23",
+      "alpine3.22"
     ],
     "bookworm": {
       "version": "14.20-1.pgdg12+1",
diff --git a/versions.sh b/versions.sh
index 0933e1813f..f9b78f5f79 100755
--- a/versions.sh
+++ b/versions.sh
@@ -7,8 +7,8 @@ supportedDebianSuites=(
 	bookworm
 )
 supportedAlpineVersions=(
+	3.23
 	3.22
-	3.21
 )
 defaultDebianSuite="${supportedDebianSuites[0]}"
 declare -A debianSuites=(