diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index 0fde676..eb3f696 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -73,25 +73,25 @@
     - sudo
     - doas
     - users
-    # - package_manager
-    # - zfs
-    # - zrepl
-    # - zsh
-    # - network
-    # - sshd
-    # - base
+    - package_manager
+    - zfs
+    - zrepl
+    - zsh
+    - network
+    - sshd
+    - base
     - firewall
-    # - cpu
-    # - ntp
-    # - nvme
-    # - hosts
-    # - build
-    # - devfs
-    # - jail
-    # - bhyve
-    # - wireguard
-    # - plainmacs
-    # - mrmanager
+    - cpu
+    - ntp
+    - nvme
+    - hosts
+    - build
+    - devfs
+    - jail
+    - bhyve
+    - wireguard
+    - emacs
+    - mrmanager
 
 - hosts: admin_git:public_dns
   vars:
diff --git a/ansible/roles/build/files/aurutils-update-devel-packages b/ansible/roles/build/files/aurutils-update-devel-packages
new file mode 100644
index 0000000..e11d1e7
--- /dev/null
+++ b/ansible/roles/build/files/aurutils-update-devel-packages
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Update packages in aurutils with -git suffix.
+#
+# This has to be done manually because aurutils does not check for new git commits every time we run an update.
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+pacman -Slq custom | grep -E -- '-git$' | xargs aurutils-sync --no-ver --reset "$@"
diff --git a/ansible/roles/build/tasks/linux.yaml b/ansible/roles/build/tasks/linux.yaml
index 228d926..03bf80f 100644
--- a/ansible/roles/build/tasks/linux.yaml
+++ b/ansible/roles/build/tasks/linux.yaml
@@ -113,6 +113,8 @@
       dest: /usr/local/bin/aurutils-purge
     - src: aurutils-sync
       dest: /usr/local/bin/aurutils-sync
+    - src: aurutils-update-devel-packages
+      dest: /usr/local/bin/
 
 - name: build aurutils inside aurutils
   become_user: "{{ build_user.name }}"