diff --git a/22/jdk/oraclelinux7/Dockerfile b/22/jdk/oraclelinux9/Dockerfile
similarity index 94%
rename from 22/jdk/oraclelinux7/Dockerfile
rename to 22/jdk/oraclelinux9/Dockerfile
index 6bbb453b..ddd99bf9 100644
--- a/22/jdk/oraclelinux7/Dockerfile
+++ b/22/jdk/oraclelinux9/Dockerfile
@@ -4,11 +4,10 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM oraclelinux:7-slim
+FROM oraclelinux:9-slim
 
 RUN set -eux; \
-# https://unix.stackexchange.com/a/477127/153467
-	yum install -y --setopt=skip_missing_names_on_install=False \
+	microdnf install \
 		gzip \
 		tar \
 		\
@@ -19,13 +18,13 @@ RUN set -eux; \
 # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
 		freetype fontconfig \
 	; \
-	rm -rf /var/cache/yum
+	microdnf clean all
 
 ENV JAVA_HOME /usr/java/openjdk-22
 ENV PATH $JAVA_HOME/bin:$PATH
 
 # Default to UTF-8 file.encoding
-ENV LANG en_US.UTF-8
+ENV LANG C.UTF-8
 
 # https://jdk.java.net/
 # >
diff --git a/23/jdk/oraclelinux7/Dockerfile b/23/jdk/oraclelinux9/Dockerfile
similarity index 94%
rename from 23/jdk/oraclelinux7/Dockerfile
rename to 23/jdk/oraclelinux9/Dockerfile
index 2630f1a5..da1cb587 100644
--- a/23/jdk/oraclelinux7/Dockerfile
+++ b/23/jdk/oraclelinux9/Dockerfile
@@ -4,11 +4,10 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM oraclelinux:7-slim
+FROM oraclelinux:9-slim
 
 RUN set -eux; \
-# https://unix.stackexchange.com/a/477127/153467
-	yum install -y --setopt=skip_missing_names_on_install=False \
+	microdnf install \
 		gzip \
 		tar \
 		\
@@ -19,13 +18,13 @@ RUN set -eux; \
 # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
 		freetype fontconfig \
 	; \
-	rm -rf /var/cache/yum
+	microdnf clean all
 
 ENV JAVA_HOME /usr/java/openjdk-23
 ENV PATH $JAVA_HOME/bin:$PATH
 
 # Default to UTF-8 file.encoding
-ENV LANG en_US.UTF-8
+ENV LANG C.UTF-8
 
 # https://jdk.java.net/
 # >
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 2dec6088..761ad19d 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -36,12 +36,7 @@ ENV JAVA_HOME /opt/openjdk-{{ env.version }}
 FROM oraclelinux:{{ oracle_version }}-slim
 
 RUN set -eux; \
-{{ if oracle_version == "7" then ( -}}
-# https://unix.stackexchange.com/a/477127/153467
-	yum install -y --setopt=skip_missing_names_on_install=False \
-{{ ) else ( -}}
 	microdnf install \
-{{ ) end -}}
 		gzip \
 		tar \
 		\
@@ -52,11 +47,7 @@ RUN set -eux; \
 # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
 		freetype fontconfig \
 	; \
-{{ if oracle_version == "7" then ( -}}
-	rm -rf /var/cache/yum
-{{ ) else ( -}}
 	microdnf clean all
-{{ ) end -}}
 
 ENV JAVA_HOME /usr/java/openjdk-{{ env.version }}
 {{
@@ -107,7 +98,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
 
 {{ if is_alpine then "" else ( -}}
 # Default to UTF-8 file.encoding
-ENV LANG {{ if is_oracle and oracle_version == "7" then "en_US.UTF-8" else "C.UTF-8" end }}
+ENV LANG C.UTF-8
 
 {{ ) end -}}
 {{ def java_version: if is_alpine then .alpine.version else .version end -}}
diff --git a/versions.json b/versions.json
index 0cc5e769..1e15b7dc 100644
--- a/versions.json
+++ b/versions.json
@@ -17,8 +17,8 @@
       }
     },
     "variants": [
+      "oraclelinux9",
       "oraclelinux8",
-      "oraclelinux7",
       "bookworm",
       "slim-bookworm",
       "bullseye",
@@ -47,8 +47,8 @@
       }
     },
     "variants": [
+      "oraclelinux9",
       "oraclelinux8",
-      "oraclelinux7",
       "bookworm",
       "slim-bookworm",
       "bullseye",
diff --git a/versions.sh b/versions.sh
index f0bb957a..21ec3429 100755
--- a/versions.sh
+++ b/versions.sh
@@ -150,8 +150,8 @@ for version in "${versions[@]}"; do
 		.[env.version] = $doc + {
 			variants: [
 				(
+					"9",
 					"8",
-					"7",
 					empty
 				| "oraclelinux" + .),
 				(
@@ -160,8 +160,8 @@ for version in "${versions[@]}"; do
 					empty
 				| ., "slim-" + .),
 				if $doc.alpine then
+					"3.19",
 					"3.18",
-					"3.17",
 					empty
 				| "alpine" + . else empty end,
 				if $doc.jdk.arches | keys | any(startswith("windows-")) then