diff --git a/common.sh b/common.sh
index a097c47ef1..3e101a41c7 100644
--- a/common.sh
+++ b/common.sh
@@ -231,6 +231,7 @@ load_environment_whitelist() {
     GIT_PROXY_COMMAND
     GIT_SSH
     RSYNC_PROXY
+    GNUPGHOME
     GPG_AGENT_INFO
     SSH_AGENT_PID
     SSH_AUTH_SOCK
diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 236a0beb86..bf4cf842f3 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -293,9 +293,10 @@ setup_env() {
     fi
 
     # Mount GnuPG's data directory for signing uploads
-    if [[ -d "$SUDO_HOME/.gnupg" ]]; then
+    : ${GNUPGHOME:="$SUDO_HOME/.gnupg"}
+    if [[ -d "${GNUPGHOME}" ]]; then
       debug "Mounting GnuPG"
-      setup_mount "${SUDO_HOME}/.gnupg" "--bind" "/home/${SUDO_USER}/.gnupg"
+      setup_mount "${GNUPGHOME}" "--bind" "${GNUPGHOME}"
 
       # bind mount the gpg agent dir if available
       GPG_AGENT_DIR="${GPG_AGENT_INFO%/*}"