diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml
index 41fde2e9..8dedfa45 100644
--- a/.github/workflows/bottle.yml
+++ b/.github/workflows/bottle.yml
@@ -50,13 +50,7 @@ jobs:
         timeout-minutes: 10
         with:
           prefix: ${{ github.workspace }}/.pkgx
-
-      - run: |
-          echo $GPG_PRIVATE_KEY | \
-            base64 -d | \
-            pkgx +gnupg.org gpg --import --batch --yes
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          pkgs: gnupg.org
 
       - uses: actions/download-artifact@v3
         if: ${{ inputs.new-version }}
@@ -92,6 +86,12 @@ jobs:
           done
         working-directory: ${{ github.workspace }}/.pkgx
 
+      - run: echo $GPG_PRIVATE_KEY |
+          base64 -d |
+          pkgx gpg --import --batch --yes
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+
       - uses: pkgxdev/brewkit/actions/bottle@v0
         id: bottle-xz
         with:
diff --git a/projects/gnupg.org/gpg b/projects/gnupg.org/gpg
index b985cf8d..e8d9d779 100755
--- a/projects/gnupg.org/gpg
+++ b/projects/gnupg.org/gpg
@@ -3,7 +3,7 @@
 d=$(dirname "$0")
 etc="$d/../etc/gnupg"
 
-export GNUPGHOME=${GNUPGHOME:-"$etc"}
+export GNUPGHOME="${GNUPGHOME:-"$etc"}"
 
 if [ ! -f "$etc/gpg.conf" ]; then
 mkdir -p "$etc"