diff --git a/devices/desktop/options.nix b/devices/desktop/options.nix
index 43e5fd0..8d3fd97 100644
--- a/devices/desktop/options.nix
+++ b/devices/desktop/options.nix
@@ -2,4 +2,5 @@
   withNiri = false;
   withGnome = true;
   withVM = false;
+  withDistrobox = false;
 }
diff --git a/devices/surface/options.nix b/devices/surface/options.nix
index 43e5fd0..be511a2 100644
--- a/devices/surface/options.nix
+++ b/devices/surface/options.nix
@@ -2,4 +2,5 @@
   withNiri = false;
   withGnome = true;
   withVM = false;
+  withDistrobox = true;
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 61b5899..00b1bcf 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,14 +4,16 @@
 
 { pkgs, lib, ... }: {
   options = {
-    withNiri = with lib; mkEnableOption "Enable niri";
-    withGnome = with lib; mkEnableOption "Enable gnome";
+    withNiri = with lib; mkEnableOption "Enable Niri";
+    withGnome = with lib; mkEnableOption "Enable Gnome";
     withVM = with lib; mkEnableOption "Enable VM related configuration";
+    withDistrobox = with lib; mkEnableOption "Enable Distrobox";
   };
 
   imports = [
     ./audio.nix
     ./containers.nix
+    ./distrobox.nix
     ./fonts.nix
     ./gnome
     ./niri
diff --git a/modules/system/distrobox.nix b/modules/system/distrobox.nix
new file mode 100644
index 0000000..408cb44
--- /dev/null
+++ b/modules/system/distrobox.nix
@@ -0,0 +1,5 @@
+{ lib, config, pkgs, ... }: lib.mkIf (config.withDistrobox) {
+  environment.systemPackages = with pkgs; [
+    distrobox
+  ];
+}