diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 9e6f170fc032bbdbb1a24677e587e91c520828fb..ec3db1c9bcaa78b82990ff6a83a446132d227b06 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -106,7 +106,7 @@ new_last_changed=$(last_changed security)
 new_last_changed_build=$(last_changed build-queues)
 
 if [[ "${old_last_changed_build}" != "${new_last_changed_build}" ]]; then
-    sudo -u archvsync /home/archvsync/signal_security-buildd-pool
+    sudo -u archvsync runmirrors -a security-buildd-pool
 fi
 
 if [[ "${old_last_changed}" != "${new_last_changed}" ]]; then
@@ -117,7 +117,7 @@ if [[ "${old_last_changed}" != "${new_last_changed}" ]]; then
     dak generate-packages-sources2 -a security
     dak generate-releases -a security >/dev/null
     /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh >/dev/null
-    sudo -u archvsync -H /home/archvsync/signal_security
+    sudo -u archvsync runmirrors -a security
 fi
 
 cleanup
diff --git a/config/debian-security/cron.weekly b/config/debian-security/cron.weekly
index f4a6e64141d35259f78151d36bfce37ff1ddc6eb..6f9102ed7f88e35a95d8b81a0caef029e6a41917 100755
--- a/config/debian-security/cron.weekly
+++ b/config/debian-security/cron.weekly
@@ -37,7 +37,7 @@ cleanup
 trap - EXIT
 
 /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh >/dev/null
-sudo -u archvsync -H /home/archvsync/signal_security
+sudo -u archvsync runmirrors -a security
 
 ${scriptsdir}/link_morgue.sh
 
diff --git a/config/debian-security/export.sh b/config/debian-security/export.sh
index f3520e82edaebc3cf65ec592afbebb4c1f74174c..6dfcb0263bcd064b45c0988df9ff2f104e75406e 100755
--- a/config/debian-security/export.sh
+++ b/config/debian-security/export.sh
@@ -23,7 +23,7 @@ function changelogs() {
     mkdir -p ${exportpublic}/changelogs
     cd ${exportpublic}/changelogs
     rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
-    sudo -H -u archvsync /home/archvsync/runmirrors metasdo > ~dak/runmirrors-metadata.log 2>&1 &
+    sudo -u archvsync runmirrors -a metasdo > ~dak/runmirrors-metadata.log 2>&1 &
 }
 
 changelogs
diff --git a/config/debian/common b/config/debian/common
index c6d981090cb1a5c749ea83ad23daee9e1f558022..bbb6e22ce16261c3d29002ad871de41e844e2afb 100755
--- a/config/debian/common
+++ b/config/debian/common
@@ -108,7 +108,7 @@ function make_buildd_dir () {
 
     # Tell the mirrors that we've updated
     log "Pushing static for incoming.d.o"
-    sudo -H -u archvsync /home/archvsync/runmirrors buildd > ~dak/runmirrors-buildd.log 2>&1 &
+    sudo -u archvsync runmirrors -a buildd > ~dak/runmirrors-buildd.log 2>&1 &
     chronic timeout -k 600 480 /usr/local/bin/static-update-component incoming.debian.org < /dev/null
     wait
 }
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index d6be502a56244aee0a324559d65c80307a890934..2d437fa1450374d05d8c02917d8c752598151cf0 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -582,7 +582,7 @@ function mirrorpush() {
             date -u > ${webdir}/${fname}
             echo "Using dak v1" >> ${webdir}/${fname}
             echo "Running on host $(hostname -f)" >> ${webdir}/${fname}
-            sudo -H -u archvsync /home/archvsync/runmirrors ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
+            sudo -u archvsync runmirrors -a ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
         fi
     done
 }
@@ -594,7 +594,7 @@ function mirrorpush-backports() {
 
 function mirrorpush-release() {
     log "Pushing cdbuilder host"
-    sudo -H -u archvsync /home/archvsync/runmirrors release > ~dak/runmirrors-release.log 2>&1 &
+    sudo -u archvsync runmirrors -a release > ~dak/runmirrors-release.log 2>&1 &
 }
 
 function i18n2() {