diff --git a/hosts/perso-desktop/configuration.nix b/hosts/perso-desktop/configuration.nix
index ccbfaf8..3cddb29 100644
--- a/hosts/perso-desktop/configuration.nix
+++ b/hosts/perso-desktop/configuration.nix
@@ -37,6 +37,7 @@
 
     server = {
       ollama.enable = true;
+      distrobox.enable = true;
     };
   };
 }
diff --git a/modules/system/server/default.nix b/modules/system/server/default.nix
index 84c8c31..7533a63 100644
--- a/modules/system/server/default.nix
+++ b/modules/system/server/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./distrobox
     ./docker
     ./ollama
     ./openssh
diff --git a/modules/system/server/distrobox/default.nix b/modules/system/server/distrobox/default.nix
new file mode 100644
index 0000000..fec6131
--- /dev/null
+++ b/modules/system/server/distrobox/default.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.modules.system.server.distrobox;
+in
+{
+  options.modules.system.server.distrobox = {
+    enable = mkEnableOption ''
+      Enable distrobox with my custom configurations
+    '';
+  };
+  config = mkIf cfg.enable {
+    modules.system.server.docker.enable = true;
+    environment.systemPackages = with pkgs; [ distrobox ];
+  };
+}
\ No newline at end of file
diff --git a/modules/system/server/docker/default.nix b/modules/system/server/docker/default.nix
index 39c121a..317777b 100644
--- a/modules/system/server/docker/default.nix
+++ b/modules/system/server/docker/default.nix
@@ -15,5 +15,7 @@ in
       enable = true;
       enableNvidia = config.modules.system.hardware.nvidia.enable;
     };
+
+    users.users.florian.extraGroups = [ "docker" ];
   };
 }
\ No newline at end of file