diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7317c4d..22ed3bd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,24 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jvmType: [jdk, jre]
-        version: [8, 11, 16]
+        version: [8, 11, 17]
     steps:
       - name: checkout
         uses: actions/checkout@v2
       - name: build
         env:
-          jvmType: ${{ matrix.jvmType }}
           version: ${{ matrix.version }}
         run: |
-          cd "${jvmType}${version}"
-          docker pull "adoptopenjdk:${version}-${jvmType}-hotspot"
-          docker build --tag "groovy:${jvmType}${version}" .
+          cd "jdk${version}"
+          docker pull "eclipse-temurin:${version}-jdk"
+          docker build --tag "groovy:jdk${version}" .
       - name: test
         env:
-          jvmType: ${{ matrix.jvmType }}
           version: ${{ matrix.version }}
           expectedGroovyVersion: 3.0.9
         run: |
           cd test
-          ./run.sh "groovy:${jvmType}${version}" "${expectedGroovyVersion}"
+          ./run.sh "groovy:jdk${version}" "${expectedGroovyVersion}"
diff --git a/README.md b/README.md
index ec0aa22..902186b 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,9 @@
 
 ## Supported tags and respective Dockerfile links
 
-* [jdk8, jdk](https://github.com/groovy/docker-groovy/blob/master/jdk8/Dockerfile)
-* [latest, jre8, jre](https://github.com/groovy/docker-groovy/blob/master/jre8/Dockerfile)
-
+* [jdk8](https://github.com/groovy/docker-groovy/blob/master/jdk8/Dockerfile)
 * [jdk11](https://github.com/groovy/docker-groovy/blob/master/jdk11/Dockerfile)
-* [jre11](https://github.com/groovy/docker-groovy/blob/master/jre11/Dockerfile)
-
-* [jdk16](https://github.com/groovy/docker-groovy/blob/master/jdk16/Dockerfile)
-* [jre16](https://github.com/groovy/docker-groovy/blob/master/jre16/Dockerfile)
+* [jdk17, jdk, latest](https://github.com/groovy/docker-groovy/blob/master/jdk17/Dockerfile)
 
 ## What is Groovy?
 
diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile
index 534de14..a60e8b6 100644
--- a/jdk11/Dockerfile
+++ b/jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jdk-hotspot
+FROM eclipse-temurin:11-jdk
 
 CMD ["groovysh"]
 
diff --git a/jdk16/Dockerfile b/jdk17/Dockerfile
similarity index 98%
rename from jdk16/Dockerfile
rename to jdk17/Dockerfile
index 850fa4c..880c359 100644
--- a/jdk16/Dockerfile
+++ b/jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jdk-hotspot
+FROM eclipse-temurin:17-jdk
 
 CMD ["groovysh"]
 
diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile
index d073edf..c8a8a64 100644
--- a/jdk8/Dockerfile
+++ b/jdk8/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:8-jdk-hotspot
+FROM eclipse-temurin:8-jdk
 
 CMD ["groovysh"]
 
diff --git a/jre11/Dockerfile b/jre11/Dockerfile
deleted file mode 100644
index 4ecc8e7..0000000
--- a/jre11/Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-FROM adoptopenjdk:11-jre-hotspot
-
-CMD ["groovysh"]
-
-ENV GROOVY_HOME /opt/groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Adding groovy user and group" \
-    && groupadd --system --gid 1000 groovy \
-    && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
-    && mkdir --parents /home/groovy/.groovy/grapes \
-    && chown --recursive groovy:groovy /home/groovy \
-    && chmod --recursive 1777 /home/groovy \
-    \
-    && echo "Symlinking root .groovy to groovy .groovy" \
-    && ln --symbolic /home/groovy/.groovy /root/.groovy
-
-VOLUME /home/groovy/.groovy/grapes
-
-WORKDIR /home/groovy
-
-RUN apt-get update \
-    && echo "Installing build dependencies" \
-    && apt-get install --yes --no-install-recommends \
-        dirmngr \
-        fontconfig \
-        gnupg \
-        unzip \
-        wget \
-    && rm --recursive --force /var/lib/apt/lists/*
-
-ENV GROOVY_VERSION 3.0.9
-RUN set -o errexit -o nounset \
-    && echo "Downloading Groovy" \
-    && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
-    \
-    && echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --batch --no-tty --keyserver keyserver.ubuntu.com --recv-keys \
-        7FAA0F2206DE228F0DB01AD741321490758AAD6F \
-        331224E1D7BE883D16E8A685825C06C827AF6B66 \
-        34441E504A937F43EB0DAEF96A65176A0FB1CD0B \
-        9A810E3B766E089FFB27C70F11B595CEDC4AEBB5 \
-        81CABC23EECA0790E8989B361FF96E10F0E13706 \
-    \
-    && echo "Checking download signature" \
-    && wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
-    && gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
-    && rm --recursive --force "${GNUPGHOME}" \
-    && rm groovy.zip.asc \
-    \
-    && echo "Installing Groovy" \
-    && unzip groovy.zip \
-    && rm groovy.zip \
-    && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \
-    && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyConsole" /usr/bin/groovyConsole \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovydoc" /usr/bin/groovydoc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovysh" /usr/bin/groovysh \
-    && ln --symbolic "${GROOVY_HOME}/bin/java2groovy" /usr/bin/java2groovy \
-    \
-    && echo "Editing startGroovy to include java.xml.bind module" \
-    && sed --in-place 's|startGroovy ( ) {|startGroovy ( ) {\n    JAVA_OPTS="$JAVA_OPTS --add-modules=ALL-SYSTEM"|' "${GROOVY_HOME}/bin/startGroovy"
-
-USER groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Testing Groovy installation" \
-    && groovy --version
diff --git a/jre16/Dockerfile b/jre16/Dockerfile
deleted file mode 100644
index b1a6c9b..0000000
--- a/jre16/Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-FROM adoptopenjdk:16-jre-hotspot
-
-CMD ["groovysh"]
-
-ENV GROOVY_HOME /opt/groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Adding groovy user and group" \
-    && groupadd --system --gid 1000 groovy \
-    && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
-    && mkdir --parents /home/groovy/.groovy/grapes \
-    && chown --recursive groovy:groovy /home/groovy \
-    && chmod --recursive 1777 /home/groovy \
-    \
-    && echo "Symlinking root .groovy to groovy .groovy" \
-    && ln --symbolic /home/groovy/.groovy /root/.groovy
-
-VOLUME /home/groovy/.groovy/grapes
-
-WORKDIR /home/groovy
-
-RUN apt-get update \
-    && echo "Installing build dependencies" \
-    && apt-get install --yes --no-install-recommends \
-        dirmngr \
-        fontconfig \
-        gnupg \
-        unzip \
-        wget \
-    && rm --recursive --force /var/lib/apt/lists/*
-
-ENV GROOVY_VERSION 3.0.9
-RUN set -o errexit -o nounset \
-    && echo "Downloading Groovy" \
-    && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
-    \
-    && echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --batch --no-tty --keyserver keyserver.ubuntu.com --recv-keys \
-        7FAA0F2206DE228F0DB01AD741321490758AAD6F \
-        331224E1D7BE883D16E8A685825C06C827AF6B66 \
-        34441E504A937F43EB0DAEF96A65176A0FB1CD0B \
-        9A810E3B766E089FFB27C70F11B595CEDC4AEBB5 \
-        81CABC23EECA0790E8989B361FF96E10F0E13706 \
-    \
-    && echo "Checking download signature" \
-    && wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
-    && gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
-    && rm --recursive --force "${GNUPGHOME}" \
-    && rm groovy.zip.asc \
-    \
-    && echo "Installing Groovy" \
-    && unzip groovy.zip \
-    && rm groovy.zip \
-    && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \
-    && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyConsole" /usr/bin/groovyConsole \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovydoc" /usr/bin/groovydoc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovysh" /usr/bin/groovysh \
-    && ln --symbolic "${GROOVY_HOME}/bin/java2groovy" /usr/bin/java2groovy \
-    \
-    && echo "Editing startGroovy to include java.xml.bind module" \
-    && sed --in-place 's|startGroovy ( ) {|startGroovy ( ) {\n    JAVA_OPTS="$JAVA_OPTS --add-modules=ALL-SYSTEM"|' "${GROOVY_HOME}/bin/startGroovy"
-
-USER groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Testing Groovy installation" \
-    && groovy --version
diff --git a/jre8/Dockerfile b/jre8/Dockerfile
deleted file mode 100644
index ddd14ad..0000000
--- a/jre8/Dockerfile
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM adoptopenjdk:8-jre-hotspot
-
-CMD ["groovysh"]
-
-ENV GROOVY_HOME /opt/groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Adding groovy user and group" \
-    && groupadd --system --gid 1000 groovy \
-    && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
-    && mkdir --parents /home/groovy/.groovy/grapes \
-    && chown --recursive groovy:groovy /home/groovy \
-    && chmod --recursive 1777 /home/groovy \
-    \
-    && echo "Symlinking root .groovy to groovy .groovy" \
-    && ln --symbolic /home/groovy/.groovy /root/.groovy
-
-VOLUME /home/groovy/.groovy/grapes
-
-WORKDIR /home/groovy
-
-RUN apt-get update \
-    && echo "Installing build dependencies" \
-    && apt-get install --yes --no-install-recommends \
-        dirmngr \
-        fontconfig \
-        gnupg \
-        unzip \
-        wget \
-    && rm --recursive --force /var/lib/apt/lists/*
-
-ENV GROOVY_VERSION 3.0.9
-RUN set -o errexit -o nounset \
-    && echo "Downloading Groovy" \
-    && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
-    \
-    && echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --batch --no-tty --keyserver keyserver.ubuntu.com --recv-keys \
-        7FAA0F2206DE228F0DB01AD741321490758AAD6F \
-        331224E1D7BE883D16E8A685825C06C827AF6B66 \
-        34441E504A937F43EB0DAEF96A65176A0FB1CD0B \
-        9A810E3B766E089FFB27C70F11B595CEDC4AEBB5 \
-        81CABC23EECA0790E8989B361FF96E10F0E13706 \
-    \
-    && echo "Checking download signature" \
-    && wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
-    && gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
-    && rm --recursive --force "${GNUPGHOME}" \
-    && rm groovy.zip.asc \
-    \
-    && echo "Installing Groovy" \
-    && unzip groovy.zip \
-    && rm groovy.zip \
-    && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \
-    && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovyConsole" /usr/bin/groovyConsole \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovydoc" /usr/bin/groovydoc \
-    && ln --symbolic "${GROOVY_HOME}/bin/groovysh" /usr/bin/groovysh \
-    && ln --symbolic "${GROOVY_HOME}/bin/java2groovy" /usr/bin/java2groovy
-
-USER groovy
-
-RUN set -o errexit -o nounset \
-    && echo "Testing Groovy installation" \
-    && groovy --version