diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index 8d7be4c..f827299 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -3,7 +3,7 @@ FROM ${JITSI_REPO}/base
 
 RUN	\
 	mkdir -p /usr/share/man/man1 && \
-	wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+	wget -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public -O /etc/apt/trusted.gpg.d/openjdk.asc && \
 	echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
 	apt-dpkg-wrap apt-get update && \
 	apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \
diff --git a/base/Dockerfile b/base/Dockerfile
index 92c085b..79950e0 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -11,7 +11,7 @@ RUN \
 	apt-dpkg-wrap apt-get update && \
 	apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
 	wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz | tar xfz - -C / && \
-	wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add - && \
+	wget -qO - https://download.jitsi.org/jitsi-key.gpg.key -O /etc/apt/trusted.gpg.d/jitsi.asc && \
 	wget -q https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 -O /usr/bin/frep && \
 	echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \
 	echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \
diff --git a/jibri/Dockerfile b/jibri/Dockerfile
index a13cfdd..caa921f 100644
--- a/jibri/Dockerfile
+++ b/jibri/Dockerfile
@@ -15,7 +15,7 @@ RUN \
 
 RUN \
 	[ "${CHROME_RELEASE}" = "latest" ] \
-	&& curl -4s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+	&& wget -q https://dl-ssl.google.com/linux/linux_signing_key.pub -O /etc/apt/trusted.gpg.d/google.asc \
 	&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
 	&& apt-dpkg-wrap apt-get update \
 	&& apt-dpkg-wrap apt-get install -y google-chrome-stable \
diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index 0820c36..53e9771 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -19,7 +19,7 @@ RUN \
 FROM ${JITSI_REPO}/base
 
 RUN \
-    wget -qO - https://prosody.im/files/prosody-debian-packages.key | apt-key add - \
+    wget -q https://prosody.im/files/prosody-debian-packages.key -O - | gpg --enarmor > /etc/apt/trusted.gpg.d/prosody.asc \
     && echo "deb http://packages.prosody.im/debian buster main" > /etc/apt/sources.list.d/prosody.list \
     && apt-dpkg-wrap apt-get update \
     && apt-dpkg-wrap apt-get install -y \