diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 971b885..d44d954 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,6 +42,7 @@ repos:
         entry: gitlint
         args: [--staged, --msg-filename]
         stages: [commit-msg]
+        pass_filenames: true
         description: Lint Git commits
 
       - id: qubesbuilder
diff --git a/salt/sys-cacher/deinit.top b/salt/sys-cacher/deinit.top
index a4f4080..1383fed 100644
--- a/salt/sys-cacher/deinit.top
+++ b/salt/sys-cacher/deinit.top
@@ -8,5 +8,6 @@ base:
   'dom0':
     - match: nodegroup
     - sys-cacher.remove-policy
-  '*':
+  'qubes:tags:updatevm-sys-cacher':
+    - match: pillar
     - sys-cacher.uninstall-client
diff --git a/salt/sys-cacher/install-client.top b/salt/sys-cacher/install-client.top
index 33b9882..7d7d8b0 100644
--- a/salt/sys-cacher/install-client.top
+++ b/salt/sys-cacher/install-client.top
@@ -5,6 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 base:
-  'I@qubes:type:template and ( ( G@os_family:Debian and not P@nodename:host and not P@nodename:whonix.* ) or G@os_family:RedHat or G@os_family:Arch )':
-    - match: compound
+  'qubes:tags:updatevm-sys-cacher':
+    - match: pillar
     - sys-cacher.install-client
diff --git a/salt/sys-cacher/uninstall-client.top b/salt/sys-cacher/uninstall-client.top
index fc0b42d..d8a8709 100644
--- a/salt/sys-cacher/uninstall-client.top
+++ b/salt/sys-cacher/uninstall-client.top
@@ -5,6 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 base:
-  'I@qubes:type:template and ( ( G@os_family:Debian and not P@nodename:host and not P@nodename:whonix.* ) or G@os_family:RedHat or G@os_family:Arch )':
-    - match: compound
+  'qubes:tags:updatevm-sys-cacher':
+    - match: pillar
     - sys-cacher.uninstall-client