diff --git a/modules/nixos/bundles/desktop/default.nix b/modules/nixos/bundles/desktop/default.nix
index 91484f8..c113529 100644
--- a/modules/nixos/bundles/desktop/default.nix
+++ b/modules/nixos/bundles/desktop/default.nix
@@ -23,6 +23,10 @@ in {
         tui = enabled;
         gui = enabled;
       };
+
+      services = {
+        docker = enabled;
+      };
     };
   };
 }
diff --git a/modules/nixos/bundles/server/default.nix b/modules/nixos/bundles/server/default.nix
index f634c86..d3a6581 100644
--- a/modules/nixos/bundles/server/default.nix
+++ b/modules/nixos/bundles/server/default.nix
@@ -22,6 +22,7 @@ in {
       };
 
       services = {
+        docker = enabled;
         openssh = enabled;
       };
     };
diff --git a/modules/nixos/services/docker/default.nix b/modules/nixos/services/docker/default.nix
new file mode 100644
index 0000000..9c03df0
--- /dev/null
+++ b/modules/nixos/services/docker/default.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.services.docker;
+in {
+  options.marleyos.services.docker.enable = lib.mkEnableOption "docker";
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.docker.enable = true;
+  };
+}