diff --git a/home-manager/roles/laptop.nix b/home-manager/roles/laptop.nix
index 6bd4cb84..0a2fc112 100644
--- a/home-manager/roles/laptop.nix
+++ b/home-manager/roles/laptop.nix
@@ -8,6 +8,7 @@ in {
     maintenance = pkgs.writeShellScriptBin "maintenance" ''
       set -e
       git -C ~/git/config pull --ff-only
+      git -C ~/git/config submodule update
       update-modes
       sudo -A update-system
     '';
diff --git a/nixos/roles/test-timer.nix b/nixos/roles/test-timer.nix
index ad384f1b..c6d0a034 100644
--- a/nixos/roles/test-timer.nix
+++ b/nixos/roles/test-timer.nix
@@ -24,6 +24,7 @@ in {
       };
       script = ''
         /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos pull --ff-only
+        /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos submodule update
         /var/cache/gc-links/result-system-hera/bin/switch-to-configuration switch
         /run/wrappers/bin/sudo -u ${user} /var/cache/gc-links/result-home-manager-hera/default/activate
       '';
diff --git a/overlays/testing.nix b/overlays/testing.nix
index cc6a3f97..e4af0b39 100644
--- a/overlays/testing.nix
+++ b/overlays/testing.nix
@@ -60,6 +60,10 @@ in {
           git "-C" repoDir "config" "user.email" "maralorn@maralorn.de"
           git "-C" repoDir "config" "user.name" "maralorn (nix-auto-updater)"
           git "-C" repoDir "commit" "-am" "Update dependencies with niv"
+        concurrently_
+          (mapConcurrently_ (\x -> test_system_config repoDir x "--builders" "@/etc/nix/machines" "--max-jobs" "0") ${self.haskellList systems})
+          (mapConcurrently_ (\x -> test_home_config repoDir x "--builders" "@/etc/nix/machines" "--max-jobs" "0") ${self.haskellList homes})
+        git "-C" repoDir "submodule" "update" "--init"
         concurrently_
           (mapConcurrently_ (test_system_config repoDir) ${self.haskellList systems})
           (mapConcurrently_ (test_home_config repoDir) ${self.haskellList homes})