diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile
index 21175c5..c1de2c9 100644
--- a/jdk11/Dockerfile
+++ b/jdk11/Dockerfile
@@ -25,13 +25,12 @@ RUN apt-get update \
         dirmngr \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip --location "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)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip.asc --location "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 \
diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
index 5d2672e..eb881f8 100644
--- a/jdk17/Dockerfile
+++ b/jdk17/Dockerfile
@@ -25,13 +25,12 @@ RUN apt-get update \
         dirmngr \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip --location "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)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip.asc --location "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 \
diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile
index 180dce7..bf1c325 100644
--- a/jdk8/Dockerfile
+++ b/jdk8/Dockerfile
@@ -25,13 +25,12 @@ RUN apt-get update \
         dirmngr \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip --location "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)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
         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" \
+    && curl --fail --show-error --silent --output groovy.zip.asc --location "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 \