diff --git a/salt/mirage-builder/configure.sls b/salt/mirage-builder/configure.sls
index b3ba374..00943f1 100644
--- a/salt/mirage-builder/configure.sls
+++ b/salt/mirage-builder/configure.sls
@@ -79,7 +79,9 @@ include:
   cmd.run:
     - require:
       - git: "{{ slsdotpath }}-git-clone"
-    - name: GNUPGHOME="$HOME/.gnupg/mirage-firewall" git -c gpg.program=gpg2 verify-commit {{ mirage_firewall_tag }}
+    - env:
+      - GNUPGHOME: "/home/user/.gnupg/mirage-firewall"
+    - name: git -c gpg.program=gpg2 verify-commit {{ mirage_firewall_tag }}
     - cwd: /home/user/src/qubes-mirage-firewall
     - runas: user
 
diff --git a/salt/qubes-builder/configure.sls b/salt/qubes-builder/configure.sls
index a391e96..d5ba843 100644
--- a/salt/qubes-builder/configure.sls
+++ b/salt/qubes-builder/configure.sls
@@ -99,7 +99,9 @@ include:
     - require:
       - git: "{{ slsdotpath }}-git-clone-builderv2"
       - cmd: "{{ slsdotpath }}-import-ownertrust"
-    - name: GNUPGHOME="$HOME/.gnupg/qubes-builder" git -c gpg.program=gpg2 verify-tag "$(git describe --tags --abbrev=0)"
+    - env:
+      - GNUPGHOME: "/home/user/.gnupg/qubes-builder"
+    - name: git -c gpg.program=gpg2 verify-commit HEAD
     - cwd: /home/user/src/qubes-builderv2
     - runas: user
 
diff --git a/salt/sys-pihole/install.sls b/salt/sys-pihole/install.sls
index 13f41f3..20e7418 100644
--- a/salt/sys-pihole/install.sls
+++ b/salt/sys-pihole/install.sls
@@ -124,7 +124,9 @@ include:
   cmd.run:
     - require:
       - git: "{{ slsdotpath }}-git-clone"
-    - name: GNUPGHOME="$HOME/.gnupg/pihole" git verify-commit {{ pihole_tag }}
+    - env:
+      - GNUPGHOME: "/home/user/.gnupg/pihole"
+    - name: git -c gpg.program=gpg2 verify-commit {{ pihole_tag }}
     - cwd: /root/pi-hole
     - runas: root