diff --git a/9.2/jdk11/Dockerfile b/9.2/jdk11/Dockerfile
index 75ddbd8..1aef039 100644
--- a/9.2/jdk11/Dockerfile
+++ b/9.2/jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jdk-buster
+FROM eclipse-temurin:11-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.2/jdk17/Dockerfile b/9.2/jdk17/Dockerfile
index 868e6ea..8242ebe 100644
--- a/9.2/jdk17/Dockerfile
+++ b/9.2/jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-buster
+FROM eclipse-temurin:17-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.2/jdk8/Dockerfile b/9.2/jdk8/Dockerfile
index 10daf13..6e0183c 100644
--- a/9.2/jdk8/Dockerfile
+++ b/9.2/jdk8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk
+FROM eclipse-temurin:8-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.2/jre11/Dockerfile b/9.2/jre11/Dockerfile
index 53b5f3d..e774560 100644
--- a/9.2/jre11/Dockerfile
+++ b/9.2/jre11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-buster
+FROM eclipse-temurin:11-jre
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.2/jre8/Dockerfile b/9.2/jre8/Dockerfile
index 0d92f1b..4fb379e 100644
--- a/9.2/jre8/Dockerfile
+++ b/9.2/jre8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre
+FROM eclipse-temurin:8-jre
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jdk11/Dockerfile b/9.3/jdk11/Dockerfile
index 7a42179..908eea5 100644
--- a/9.3/jdk11/Dockerfile
+++ b/9.3/jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jdk-buster
+FROM eclipse-temurin:11-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jdk17/Dockerfile b/9.3/jdk17/Dockerfile
index 7376e74..2255f8d 100644
--- a/9.3/jdk17/Dockerfile
+++ b/9.3/jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-buster
+FROM eclipse-temurin:17-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jdk8/Dockerfile b/9.3/jdk8/Dockerfile
index 4556e7c..2ba2894 100644
--- a/9.3/jdk8/Dockerfile
+++ b/9.3/jdk8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk
+FROM eclipse-temurin:8-jdk
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jre11/Dockerfile b/9.3/jre11/Dockerfile
index 765662a..ed19434 100644
--- a/9.3/jre11/Dockerfile
+++ b/9.3/jre11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-buster
+FROM eclipse-temurin:11-jre
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/9.3/jre8/Dockerfile b/9.3/jre8/Dockerfile
index e0eb9b2..9339fee 100644
--- a/9.3/jre8/Dockerfile
+++ b/9.3/jre8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre
+FROM eclipse-temurin:8-jre
 
 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*