diff --git a/3.1/alpine3.16/Dockerfile b/3.1/alpine3.18/Dockerfile
similarity index 99%
rename from 3.1/alpine3.16/Dockerfile
rename to 3.1/alpine3.18/Dockerfile
index 007b802002..679171a895 100644
--- a/3.1/alpine3.16/Dockerfile
+++ b/3.1/alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.18/Dockerfile
similarity index 99%
rename from 3.2/alpine3.16/Dockerfile
rename to 3.2/alpine3.18/Dockerfile
index a813244cd3..17449c0a15 100644
--- a/3.2/alpine3.16/Dockerfile
+++ b/3.2/alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/versions.json b/versions.json
index 4c85019d79..0d8a13b66d 100644
--- a/versions.json
+++ b/versions.json
@@ -28,8 +28,8 @@
       "slim-bullseye",
       "buster",
       "slim-buster",
-      "alpine3.17",
-      "alpine3.16"
+      "alpine3.18",
+      "alpine3.17"
     ],
     "version": "3.1.4"
   },
@@ -72,8 +72,8 @@
       "slim-bullseye",
       "buster",
       "slim-buster",
-      "alpine3.17",
-      "alpine3.16"
+      "alpine3.18",
+      "alpine3.17"
     ],
     "version": "3.2.2"
   }
diff --git a/versions.sh b/versions.sh
index 297c9f9aa0..e9dde46d12 100755
--- a/versions.sh
+++ b/versions.sh
@@ -75,15 +75,14 @@ for version in "${versions[@]}"; do
 					empty # trailing comma hack
 				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 				(
-					# Alpine 3.17 defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0
+					# Alpine 3.17+ defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0
 					# https://bugs.ruby-lang.org/issues/18658
 					# https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174
-					if [ "2.7", "3.0" ] | index(env.version) then empty else
+					if [ "2.7", "3.0" ] | index(env.version) then "3.16" else
+						"3.18",
 						"3.17",
 						empty # trailing comma hack
-					end,
-					"3.16",
-					empty # trailing comma hack
+					end
 				| "alpine" + .)
 			],
 		}