diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix
index 540eb81..54b524b 100644
--- a/containers/server-n0/git.nix
+++ b/containers/server-n0/git.nix
@@ -148,8 +148,13 @@ in
 
         services.journald.extraConfig = "ForwardToConsole=yes";
 
+        virtualisation.containerd.enable = true;
+        virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options = [ "userxattr" ];
+
         virtualisation.docker.enable = true;
-        virtualisation.docker.daemon.settings.storage-opts = [ "overlay2.userxattr=true" ];
+        virtualisation.docker.extraOptions = "--containerd /run/containerd/containerd.sock";
+        systemd.services.docker.wants = [ "containerd.service" ];
+        systemd.services.docker.after = [ "containerd.service" ];
 
         systemd.services.load-ci-job-image = {
           description = "Load the CI job Docker image";