diff --git a/playbooks/tasks/include/upgrade-server.yml b/playbooks/tasks/include/upgrade-server.yml
index 5c26931734ee694c0a1acf0926826cea3527edeb..27626baffa05b6dbe1f2d3a756d4f22a2383fa43 100644
--- a/playbooks/tasks/include/upgrade-server.yml
+++ b/playbooks/tasks/include/upgrade-server.yml
@@ -12,6 +12,18 @@
     upgrade: yes
   register: pacman_upgrade
 
+- name: check for running builds
+  block:
+    - name: list build-related processes
+      command: pgrep -x 'mkarchroot|makechrootpkg|systemd-nspawn'
+      register: pgrep
+      ignore_errors: true
+
+    - name: abort reboot with running builds
+      meta: end_host
+      when: pgrep is succeeded
+  when: "'buildservers' in group_names"
+
 - name: wait for svntogit to finish
   wait_for:
     path: /srv/svntogit/update-repos.sh.lock