diff --git a/hosts/neon/configuration.nix b/hosts/neon/configuration.nix
index a647933..e06071b 100644
--- a/hosts/neon/configuration.nix
+++ b/hosts/neon/configuration.nix
@@ -5,6 +5,7 @@
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/certificates.nix
+    ../../modules/nixos/docker.nix
     ../../modules/nixos/gnupg.nix
     ../../modules/nixos/locales.nix
     ../../modules/nixos/networking.nix
diff --git a/modules/nixos/docker.nix b/modules/nixos/docker.nix
new file mode 100644
index 0000000..4a95905
--- /dev/null
+++ b/modules/nixos/docker.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ...}:
+
+{
+  virtualisation.docker = {
+    enable = true;
+    # Customize Docker daemon settings
+    daemon.settings = {
+      dns = [ "1.1.1.1" "8.8.8.8" ];
+      log-driver = "journald";
+      registry-mirrors = [ "https://mirror.gcr.io" ];
+      storage-driver = "overlay2";
+    };
+    # Use the rootless mode
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+    # Install docker-compose
+    extraPackages = with pkgs; [
+      docker-compose
+    ];
+  };
+}
diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix
index ea8630d..305806e 100644
--- a/modules/nixos/users.nix
+++ b/modules/nixos/users.nix
@@ -5,7 +5,7 @@
   users.users.aaron = {
     isNormalUser = true;
     group = "users";
-    extraGroups = [ "wheel" "networkmanager" ];
+    extraGroups = [ "wheel" "networkmanager" "docker" ];
     shell = pkgs.zsh;
   };