diff --git a/salt/qubes-builder/configure.sls b/salt/qubes-builder/configure.sls
index 8e4d6b2..94da951 100644
--- a/salt/qubes-builder/configure.sls
+++ b/salt/qubes-builder/configure.sls
@@ -15,14 +15,6 @@ include:
   - dotfiles.copy-x11
   - docker.configure
 
-"{{ slsdotpath }}-gpg-split-domain":
-  file.managed:
-    - name: /rw/config/gpg-split-domain
-    - source: salt://{{ slsdotpath }}/files/client/gpg-split-domain
-    - mode: '0644'
-    - user: root
-    - group: root
-
 "{{ slsdotpath }}-rpmmacros":
   file.managed:
     - name: /home/user/.rpmmacros
diff --git a/salt/qubes-builder/files/client/gpg-split-domain b/salt/qubes-builder/files/client/gpg-split-domain
deleted file mode 100644
index dea2381..0000000
--- a/salt/qubes-builder/files/client/gpg-split-domain
+++ /dev/null
@@ -1 +0,0 @@
-@default
diff --git a/salt/qubes-builder/files/client/gpg-split-domain.license b/salt/qubes-builder/files/client/gpg-split-domain.license
deleted file mode 100644
index 7fd1c84..0000000
--- a/salt/qubes-builder/files/client/gpg-split-domain.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/salt/qubes-builder/files/client/rpmmacros b/salt/qubes-builder/files/client/rpmmacros
index 3ead012..a360a1e 100644
--- a/salt/qubes-builder/files/client/rpmmacros
+++ b/salt/qubes-builder/files/client/rpmmacros
@@ -2,12 +2,12 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only
 
-%__gpg /usr/bin/qubes-gpg-client-wrapper
+%__gpg /usr/bin/gpg2
 
 %__gpg_check_password_cmd %{__gpg} \
         gpg --batch --no-verbose -u "%{_gpg_name}" -s
 
-%__gpg_sign_cmd /bin/sh sh -c '/usr/bin/qubes-gpg-client-wrapper \\\
+%__gpg_sign_cmd /bin/sh sh -c '/usr/bin/gpg2 \\\
         --batch --no-verbose \\\
         %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \\\
         -u "%{_gpg_name}" \\\