diff --git a/playbooks/tasks/include/upgrade-server.yml b/playbooks/tasks/include/upgrade-server.yml
index 5a89f42e39223caac1e647ad5963a6b8913d1242..285875d1ba514a0506faa821bc9169f73dbb648a 100644
--- a/playbooks/tasks/include/upgrade-server.yml
+++ b/playbooks/tasks/include/upgrade-server.yml
@@ -39,11 +39,6 @@
 
 - name: gemini pre-reboot checks
   block:
-    - name: wait for svntogit to finish
-      wait_for:
-        path: /srv/svntogit/update-repos.sh.lock
-        state: absent
-
     - name: list logged on users
       command: who
       register: who
@@ -53,6 +48,14 @@
       when:
         - who is changed
         - who.stdout_lines|length > 1
+
+    - name: stop arch-svntogit.timer
+      service: name=arch-svntogit.timer state=stopped
+
+    - name: wait for svntogit to finish
+      wait_for:
+        path: /srv/svntogit/update-repos.sh.lock
+        state: absent
   when: inventory_hostname == "gemini.archlinux.org"
 
 - name: reboot