diff --git a/salt/kicksecure-minimal/create.sls b/salt/kicksecure-minimal/create.sls
index 3af1a01..ebbaa85 100644
--- a/salt/kicksecure-minimal/create.sls
+++ b/salt/kicksecure-minimal/create.sls
@@ -54,8 +54,5 @@ features:
   - appmenus-dispvm
 - set:
   - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop"
-tags:
-- add:
-  - updatevm-sys-cacher
 {%- endload %}
 {{ load(defaults) }}
diff --git a/salt/sys-cacher/files/client/systemd/qubes-apt-cacher-ng-repo.service b/salt/sys-cacher/files/client/systemd/qubes-apt-cacher-ng-repo.service
index c8a1343..666a32a 100644
--- a/salt/sys-cacher/files/client/systemd/qubes-apt-cacher-ng-repo.service
+++ b/salt/sys-cacher/files/client/systemd/qubes-apt-cacher-ng-repo.service
@@ -6,6 +6,9 @@
 Description=Dynamically write repository definitions for use of apt-cacher-ng
 After=qubes-misc-post.service
 After=qubes-sysinit.service
+## Run before Qrexec call (Salt, user on terminal, automatic update check)
+## tries to update the package index.
+Before=qubes-qrexec-agent.service
 Before=qubes-update-check.service
 
 [Service]
diff --git a/salt/utils/tools/common/update.sls b/salt/utils/tools/common/update.sls
index 86ccf2c..ccb732a 100644
--- a/salt/utils/tools/common/update.sls
+++ b/salt/utils/tools/common/update.sls
@@ -4,12 +4,6 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
-{% if salt['cmd.retcode']('command -v apt-cacher-ng-repo >/dev/null') == 0 -%}
-"common-update-run-apt-cacher-ng-repo":
-  cmd.run:
-    - name: apt-cacher-ng-repo
-{% endif -%}
-
 "common-updated":
   pkg.uptodate:
     - refresh: True