diff --git a/configurations/tmux/dodona.yml b/configurations/tmux/dodona.yml
index 091104de..45ac8625 100644
--- a/configurations/tmux/dodona.yml
+++ b/configurations/tmux/dodona.yml
@@ -52,4 +52,4 @@ windows:
         - bundle exec rails jobs:work
         - ./bin/webpack-dev-server
   - logs: tail -f log/development.log
-  - db: start-db
+  - db: start-dockers
diff --git a/profiles/common/default.nix b/profiles/common/default.nix
index a3ec3dff..d780f975 100644
--- a/profiles/common/default.nix
+++ b/profiles/common/default.nix
@@ -51,10 +51,13 @@
     ];
   };
 
-  services.locate = {
-    enable = true;
-    interval = "hourly";
-    localuser = "charlotte";
+  services = {
+    atd.enable = true;
+    locate = {
+      enable = true;
+      interval = "hourly";
+      localuser = "charlotte";
+    };
   };
 
   system.autoUpgrade = {
diff --git a/shells/dodona.nix b/shells/dodona.nix
index c9e27003..7fd7f5c2 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -10,12 +10,12 @@ pkgs.mkShell {
     yarn
     zlib
     (
-      pkgs.writeScriptBin "start-db" ''
+      pkgs.writeScriptBin "start-dockers" ''
         #!${bash}/bin/bash
 
         function stopdockers {
-          docker stop dodona-db
-          docker stop dodona-cache
+          echo ${docker}/bin/docker stop dodona-db | ${at}/bin/at NOW
+          echo ${docker}/bin/docker stop dodona-cache | ${at}/bin/at NOW
         }
 
         trap stopdockers 0