diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index c72ecf97..0e43f0a5 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -13,8 +13,6 @@
 
   features = {
     cli = {
-      docker.enable = true;
-
       password-store.enable = true;
       password-store.extensions = with pkgs.passExtensions; [
         pass-otp
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 6e2bd4ff..c10186d5 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./avahi.nix
     ./dconf.nix
-    ./docker.nix
     ./dwm
     ./fonts.nix
     ./gitea-actions-runner.nix
diff --git a/modules/nixos/docker.nix b/modules2/docker.nix
similarity index 55%
rename from modules/nixos/docker.nix
rename to modules2/docker.nix
index 916a7cae..853dd2ee 100644
--- a/modules/nixos/docker.nix
+++ b/modules2/docker.nix
@@ -1,14 +1,7 @@
-{ config, lib, ... }:
+{ config, ... }:
 
-with lib;
-
-let
-  cfg = config.features.cli.docker;
-in
 {
-  options.features.cli.docker.enable = mkEnableOption "Enable docker";
-
-  config = mkIf cfg.enable {
+  flake.modules.nixos.pc = {
     virtualisation = {
       oci-containers.backend = "docker";
 
@@ -21,5 +14,7 @@ in
         };
       };
     };
+
+    users.users.${config.flake.meta.owner.username}.extraGroups = [ "docker" ];
   };
 }
diff --git a/users/opdavies.nix b/users/opdavies.nix
index b8aa85c9..62304f8e 100644
--- a/users/opdavies.nix
+++ b/users/opdavies.nix
@@ -17,7 +17,6 @@ with lib;
       "networkmanager"
       "wheel"
     ]
-    ++ optional config.features.cli.docker.enable "docker"
     ++ optional config.features.cli.podman.enable "podman";
 
     packages = with pkgs; [