diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile
index 73ed0909..43dedd29 100644
--- a/12.0-rc/apache/Dockerfile
+++ b/12.0-rc/apache/Dockerfile
@@ -121,8 +121,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile
index ae1553e9..d2679cc9 100644
--- a/12.0-rc/fpm-alpine/Dockerfile
+++ b/12.0-rc/fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile
index ef7cddcb..90c1274c 100644
--- a/12.0-rc/fpm/Dockerfile
+++ b/12.0-rc/fpm/Dockerfile
@@ -113,8 +113,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 38c2f3c5..c58d9466 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -121,8 +121,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index a929da50..2b904235 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index fdbc104c..4ea38267 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -113,8 +113,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile
index 1b4cb624..df3c1999 100644
--- a/13.0-rc/apache/Dockerfile
+++ b/13.0-rc/apache/Dockerfile
@@ -121,8 +121,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile
index 83dc5d1d..7bf5f8e4 100644
--- a/13.0-rc/fpm-alpine/Dockerfile
+++ b/13.0-rc/fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile
index d058729b..88d3eeee 100644
--- a/13.0-rc/fpm/Dockerfile
+++ b/13.0-rc/fpm/Dockerfile
@@ -113,8 +113,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 8f881b23..64d3bfe3 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -121,8 +121,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 2afe137e..fd04c20a 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 165da1f4..ccde8c8d 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -113,8 +113,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 6207d644..6eabcf84 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -99,8 +99,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index eb21a29c..a11f62f1 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -112,8 +112,8 @@ RUN set -ex; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    busybox killall gpg-agent || true; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
+    gpgconf --kill all; \
     rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     rm -rf /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \