diff --git a/profiles/common/default.nix b/profiles/common/default.nix
index 2dacc35f..02989107 100644
--- a/profiles/common/default.nix
+++ b/profiles/common/default.nix
@@ -76,13 +76,10 @@
     };
   };
 
-  services = {
-    atd.enable = true;
-    locate = {
-      enable = true;
-      interval = "hourly";
-      localuser = "charlotte";
-    };
+  services.locate = {
+    enable = true;
+    interval = "hourly";
+    localuser = "charlotte";
   };
 
   system.autoUpgrade = {
diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix
index da944a55..a758f68a 100644
--- a/shells/accentor-api.nix
+++ b/shells/accentor-api.nix
@@ -13,11 +13,13 @@ pkgs.mkShell {
       pkgs.writeScriptBin "start-db" ''
         #!/${pkgs.zsh}/bin/zsh
 
-        trap "docker stop accentor-db" 0
-        docker run --name accentor-db -p 5432:5432 --rm -v accentor-db-data:/var/lib/postgresql/data -e POSTGRES_PASSWORD=accentor postgres:latest &
+        trap "systemd-run --user --no-block docker stop accentor-db" 0
+        docker run -d --name accentor-db -p 5432:5432 --rm -v accentor-db-data:/var/lib/postgresql/data -e POSTGRES_PASSWORD=accentor postgres:latest
 
-        child=$!
-        wait $child
+        while [ 1 -eq 1 ]
+        do
+          sleep 1000
+        done
       ''
     )
   ];
diff --git a/shells/dodona.nix b/shells/dodona.nix
index 0e9c685b..afabd989 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -13,12 +13,7 @@ pkgs.mkShell {
       pkgs.writeScriptBin "start-dockers" ''
         #!${bash}/bin/bash
 
-        function stopdockers {
-          echo ${docker}/bin/docker stop dodona-db | at NOW
-          echo ${docker}/bin/docker stop dodona-cache | at NOW
-        }
-
-        trap stopdockers 0
+        trap "systemd-run --user --no-block docker stop dodona-db dodona-cache" 0
 
         docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest
         docker run -d --name dodona-cache -p 11211:11211 --rm memcached:latest