diff --git a/modules/docker.nix b/modules/docker.nix
new file mode 100644
index 0000000..f04b3b0
--- /dev/null
+++ b/modules/docker.nix
@@ -0,0 +1,16 @@
+{ lib, ... }:
+{
+  virtualisation.docker = {
+    enable = lib.mkDefault true;
+    logDriver = "local";
+    storageDriver = "overlay2";
+    daemon.settings = {
+      experimental = true;
+      exec-opts = [ "native.cgroupdriver=systemd" ];
+      log-opts = {
+        max-size = "10m";
+        max-file = "5";
+      };
+    };
+  };
+}
diff --git a/systems/configuration.nix b/systems/configuration.nix
index 58edfce..b6f47c1 100644
--- a/systems/configuration.nix
+++ b/systems/configuration.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
+{ lib, ... }:
 {
   security.auditd.enable = true;
 
@@ -21,22 +16,17 @@
     };
   };
 
-  services = {
-
-    autopull = {
-      enable = true;
-      ssh-key = "/root/.ssh/id_ed25519_ghdeploy";
-      path = /root/dotfiles;
-    };
+  services.autopull = {
+    enable = true;
+    ssh-key = "/root/.ssh/id_ed25519_ghdeploy";
+    path = /root/dotfiles;
   };
 
-  system = {
-    autoUpgrade = {
-      enable = true;
-      flags = [ "--accept-flake-config" ];
-      randomizedDelaySec = "1h";
-      persistent = true;
-      flake = "github:RAD-Development/nix-dotfiles";
-    };
+  system.autoUpgrade = {
+    enable = true;
+    flags = [ "--accept-flake-config" ];
+    randomizedDelaySec = "1h";
+    persistent = true;
+    flake = "github:RAD-Development/nix-dotfiles";
   };
 }
diff --git a/systems/jeeves-jr/configuration.nix b/systems/jeeves-jr/configuration.nix
index 37fe12c..0f39e48 100644
--- a/systems/jeeves-jr/configuration.nix
+++ b/systems/jeeves-jr/configuration.nix
@@ -12,29 +12,6 @@
     useSystemdBoot = true;
   };
 
-  virtualisation = {
-    docker = {
-      enable = true;
-      recommendedDefaults = true;
-      logDriver = "local";
-      storageDriver = "overlay2";
-      daemon."settings" = {
-        experimental = true;
-        data-root = "/var/lib/docker";
-        exec-opts = [ "native.cgroupdriver=systemd" ];
-        log-opts = {
-          max-size = "10m";
-          max-file = "5";
-        };
-      };
-    };
-
-    podman = {
-      enable = true;
-      recommendedDefaults = true;
-    };
-  };
-
   environment = {
     systemPackages = with pkgs; [ docker-compose ];
     etc = {
diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix
index 13a3630..cacb083 100644
--- a/systems/jeeves/configuration.nix
+++ b/systems/jeeves/configuration.nix
@@ -17,29 +17,6 @@
     useSystemdBoot = true;
   };
 
-  virtualisation = {
-    docker = {
-      enable = true;
-      recommendedDefaults = true;
-      logDriver = "local";
-      storageDriver = "overlay2";
-      daemon."settings" = {
-        experimental = true;
-        data-root = "/var/lib/docker";
-        exec-opts = [ "native.cgroupdriver=systemd" ];
-        log-opts = {
-          max-size = "10m";
-          max-file = "5";
-        };
-      };
-    };
-
-    podman = {
-      enable = true;
-      recommendedDefaults = true;
-    };
-  };
-
   environment = {
     systemPackages = with pkgs; [ docker-compose ];
     etc = {
diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix
index 857ae26..d0606ba 100644
--- a/systems/palatine-hill/configuration.nix
+++ b/systems/palatine-hill/configuration.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
+{ config, pkgs, ... }:
 let
   keygen = key: {
     "${key}" = {
@@ -87,24 +82,7 @@ in
     };
   };
 
-  virtualisation = {
-    # Disabling Podman as topgrade apparently prefers podman over docker and now I cant update anything :(
-    docker = {
-      enable = true;
-      recommendedDefaults = true;
-      logDriver = "local";
-      storageDriver = "overlay2";
-      daemon."settings" = {
-        experimental = true;
-        data-root = "/var/lib/docker2";
-        exec-opts = [ "native.cgroupdriver=systemd" ];
-        log-opts = {
-          max-size = "10m";
-          max-file = "5";
-        };
-      };
-    };
-  };
+  virtualisation.docker.daemon.settings.data-root = "/var/lib/docker2";
 
   environment.systemPackages = with pkgs; [
     attic-client
diff --git a/users/alice/systems/artemision/configuration.nix b/users/alice/systems/artemision/configuration.nix
index 40d0f6d..6d09c1b 100644
--- a/users/alice/systems/artemision/configuration.nix
+++ b/users/alice/systems/artemision/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   imports = [
     ../configuration.nix
@@ -35,24 +35,6 @@
     supportedLocales = [ "en_US.UTF-8/UTF-8" ];
   };
 
-  virtualisation = {
-    docker = {
-      enable = true;
-      recommendedDefaults = true;
-      logDriver = "local";
-      storageDriver = "overlay2";
-      daemon."settings" = {
-        experimental = true;
-        data-root = "/var/lib/docker";
-        exec-opts = [ "native.cgroupdriver=systemd" ];
-        log-opts = {
-          max-size = "10m";
-          max-file = "5";
-        };
-      };
-    };
-  };
-
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   #  services.fwupd.package =
diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/users/richie/systems/rhapsody-in-green/configuration.nix
index 9e2b65a..0e29b66 100644
--- a/users/richie/systems/rhapsody-in-green/configuration.nix
+++ b/users/richie/systems/rhapsody-in-green/configuration.nix
@@ -91,22 +91,5 @@
     };
   };
 
-  virtualisation = {
-    docker = {
-      enable = true;
-      recommendedDefaults = true;
-      logDriver = "local";
-      storageDriver = "overlay2";
-      daemon."settings" = {
-        experimental = true;
-        exec-opts = [ "native.cgroupdriver=systemd" ];
-        log-opts = {
-          max-size = "10m";
-          max-file = "5";
-        };
-      };
-    };
-  };
-
   system.stateVersion = "23.11";
 }