diff --git a/common.d/build_functions.sh b/common.d/build_functions.sh
index bb9713f..cdec159 100644
--- a/common.d/build_functions.sh
+++ b/common.d/build_functions.sh
@@ -138,11 +138,12 @@ detach_chroot()
     }
 
     rootdir=$(realpath "$1")
-    umount "$rootdir/proc"
-    umount "$rootdir/sys"
-    umount "$rootdir/dev/pts"
-    umount "$rootdir/dev/shm"
-    umount "$rootdir/dev"
+    killall gpg-agent > /dev/null 2>&1
+    umount "$rootdir/proc" > /dev/null 2>&1 
+    umount "$rootdir/sys" > /dev/null 2>&1
+    umount "$rootdir/dev/pts" > /dev/null 2>&1
+    umount "$rootdir/dev/shm" > /dev/null 2>&1
+    umount "$rootdir/dev" > /dev/null 2>&1
     return 0
 }