diff --git a/amazoncorretto/12.0/jdk17-al2023/Dockerfile b/amazoncorretto/12.0/jdk17-al2023/Dockerfile
index 7796cbb..18f5795 100644
--- a/amazoncorretto/12.0/jdk17-al2023/Dockerfile
+++ b/amazoncorretto/12.0/jdk17-al2023/Dockerfile
@@ -32,7 +32,8 @@ RUN set -xe ; \
 	mkdir -p $TMPDIR ; \
 	#
 	# Install utilities needed for setup.
-    yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \
 	#
 	# fetch GPG keys
 	export GNUPGHOME=/jetty-keys ; \
diff --git a/amazoncorretto/12.0/jdk21-al2023/Dockerfile b/amazoncorretto/12.0/jdk21-al2023/Dockerfile
index c9380f8..a6cb5ce 100644
--- a/amazoncorretto/12.0/jdk21-al2023/Dockerfile
+++ b/amazoncorretto/12.0/jdk21-al2023/Dockerfile
@@ -32,7 +32,8 @@ RUN set -xe ; \
 	mkdir -p $TMPDIR ; \
 	#
 	# Install utilities needed for setup.
-    yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \
 	#
 	# fetch GPG keys
 	export GNUPGHOME=/jetty-keys ; \
diff --git a/amazoncorretto/12.0/jdk23-al2023/Dockerfile b/amazoncorretto/12.0/jdk23-al2023/Dockerfile
index b4e5342..aecee5f 100644
--- a/amazoncorretto/12.0/jdk23-al2023/Dockerfile
+++ b/amazoncorretto/12.0/jdk23-al2023/Dockerfile
@@ -32,7 +32,8 @@ RUN set -xe ; \
 	mkdir -p $TMPDIR ; \
 	#
 	# Install utilities needed for setup.
-    yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \
 	#
 	# fetch GPG keys
 	export GNUPGHOME=/jetty-keys ; \
diff --git a/baseDockerfile-amazoncorretto b/baseDockerfile-amazoncorretto
index f7270c2..c8853ba 100644
--- a/baseDockerfile-amazoncorretto
+++ b/baseDockerfile-amazoncorretto
@@ -31,7 +31,8 @@ RUN set -xe ; \
 	mkdir -p $TMPDIR ; \
 	#
 	# Install utilities needed for setup.
-    yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	yum install -y shadow-utils tar xz gzip which && yum clean all ; \
+	command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \
 	#
 	# fetch GPG keys
 	export GNUPGHOME=/jetty-keys ; \