diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix
index 20b862ad..174de5a1 100644
--- a/devices/servivi/default.nix
+++ b/devices/servivi/default.nix
@@ -69,5 +69,6 @@ in {
     sshd.enable = true;
   };
 
+  khepri.enable = true;
   services.kmscon.enable = true;
 }
diff --git a/nixosModules/docker/default.nix b/nixosModules/docker/default.nix
index e96b125b..2d680386 100644
--- a/nixosModules/docker/default.nix
+++ b/nixosModules/docker/default.nix
@@ -12,6 +12,14 @@ in {
   imports = [khepri.nixosModules.default];
 
   options.khepri = {
+    enable = mkOption {
+      default = cfg.compositions != {};
+      type = types.bool;
+      description = ''
+        Option to enable docker even without compositions.
+      '';
+    };
+
     rwDataDir = mkOption {
       default = "/var/lib/docker";
       type = types.str;
@@ -26,7 +34,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.compositions != {}) {
+  config = mkIf (cfg.enable) {
     users.extraUsers.${mainUser}.extraGroups = ["docker"];
 
     virtualisation = {