diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index 33bc686..535720e 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -46,9 +46,13 @@ RUN set -eux; \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.1/Dockerfile b/variants/3.0.1/Dockerfile
index fa3cce9..0d9bc23 100644
--- a/variants/3.0.1/Dockerfile
+++ b/variants/3.0.1/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.2/Dockerfile b/variants/3.0.2/Dockerfile
index d5fcda7..7cc74fa 100644
--- a/variants/3.0.2/Dockerfile
+++ b/variants/3.0.2/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.3/Dockerfile b/variants/3.0.3/Dockerfile
index a40b20c..3a950bb 100644
--- a/variants/3.0.3/Dockerfile
+++ b/variants/3.0.3/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.4/Dockerfile b/variants/3.0.4/Dockerfile
index 1da20c5..f8658b3 100644
--- a/variants/3.0.4/Dockerfile
+++ b/variants/3.0.4/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.5/Dockerfile b/variants/3.0.5/Dockerfile
index 242abe0..6cd8a3b 100644
--- a/variants/3.0.5/Dockerfile
+++ b/variants/3.0.5/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.6/Dockerfile b/variants/3.0.6/Dockerfile
index e7a0e22..d89d947 100644
--- a/variants/3.0.6/Dockerfile
+++ b/variants/3.0.6/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.7/Dockerfile b/variants/3.0.7/Dockerfile
index 59bc19a..5cbeefa 100644
--- a/variants/3.0.7/Dockerfile
+++ b/variants/3.0.7/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.8/Dockerfile b/variants/3.0.8/Dockerfile
index e96f3ab..35fa829 100644
--- a/variants/3.0.8/Dockerfile
+++ b/variants/3.0.8/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.0.9/Dockerfile b/variants/3.0.9/Dockerfile
index cc1684e..d4a6eab 100644
--- a/variants/3.0.9/Dockerfile
+++ b/variants/3.0.9/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.0/Dockerfile b/variants/3.1.0/Dockerfile
index a1e8b63..7296782 100644
--- a/variants/3.1.0/Dockerfile
+++ b/variants/3.1.0/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.1/Dockerfile b/variants/3.1.1/Dockerfile
index f71ea1e..fc3d065 100644
--- a/variants/3.1.1/Dockerfile
+++ b/variants/3.1.1/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.2/Dockerfile b/variants/3.1.2/Dockerfile
index ea10beb..6ff10c5 100644
--- a/variants/3.1.2/Dockerfile
+++ b/variants/3.1.2/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.3/Dockerfile b/variants/3.1.3/Dockerfile
index 1445755..3cc4a24 100644
--- a/variants/3.1.3/Dockerfile
+++ b/variants/3.1.3/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.4/Dockerfile b/variants/3.1.4/Dockerfile
index fc620e5..d7183b7 100644
--- a/variants/3.1.4/Dockerfile
+++ b/variants/3.1.4/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.5/Dockerfile b/variants/3.1.5/Dockerfile
index b201364..4534f93 100644
--- a/variants/3.1.5/Dockerfile
+++ b/variants/3.1.5/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.6/Dockerfile b/variants/3.1.6/Dockerfile
index 216cc7d..ad4a4f3 100644
--- a/variants/3.1.6/Dockerfile
+++ b/variants/3.1.6/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data
diff --git a/variants/3.1.7/Dockerfile b/variants/3.1.7/Dockerfile
index bc83727..dd964e9 100644
--- a/variants/3.1.7/Dockerfile
+++ b/variants/3.1.7/Dockerfile
@@ -33,9 +33,13 @@ RUN set -eux; \
     rm -fv ""; \
     rm -fv ".sig"; \
     apk del gnupg gpg-agent dirmngr; \
-    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
     killall dirmngr; \
     killall gpg-agent; \
+    # Fix error: rm: can't remove '/root/.gnupg/S.gpg-agent.extra': No such file or directory
+    while ls /root/.gnupg/S.* > /dev/null; do \
+        echo "Waiting for gpg sockets to be removed"; \
+        sleep 1; \
+    done; \
     rm -rf /root/.gnupg;
 
 VOLUME /data