diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index dc1e426..0bc8cd5 100644
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -65,12 +65,12 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
 	tar -xzf roundcubemail.tar.gz -C /usr/src/; \
+	gpgconf --kill all; \
+	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
 	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
-	rm -rf /usr/src/roundcubemail/installer; \
-	rm roundcubemail.tar.gz
+	rm -rf /usr/src/roundcubemail/installer
 
 # include the wait-for-it.sh script
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 2d08142..c25be08 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -62,12 +62,12 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
-	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc; \
 	tar -xzf roundcubemail.tar.gz -C /usr/src/; \
+	gpgconf --kill all; \
+	rm -r "$GNUPGHOME" roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	# upstream tarballs include ./roundcubemail-${ROUNDCUBEMAIL_VERSION}/ so this gives us /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION}
 	mv /usr/src/roundcubemail-${ROUNDCUBEMAIL_VERSION} /usr/src/roundcubemail; \
-	rm -rf /usr/src/roundcubemail/installer; \
-	rm roundcubemail.tar.gz
+	rm -rf /usr/src/roundcubemail/installer
 
 # include the wait-for-it.sh script
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh