diff --git a/modules/features/authentik.nix b/modules/features/authentik.nix
index 297444d..4ea4ea6 100644
--- a/modules/features/authentik.nix
+++ b/modules/features/authentik.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.authentik = { config, lib, pkgs, ... }: let
 
@@ -10,6 +10,10 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
         config = {
 
             networking.firewall.interfaces = {
diff --git a/modules/features/home-assistant/home-assistant.nix b/modules/features/home-assistant/home-assistant.nix
index c4d152f..58832b2 100644
--- a/modules/features/home-assistant/home-assistant.nix
+++ b/modules/features/home-assistant/home-assistant.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.home-assistant = { config, lib, ... }: let
 
@@ -8,6 +8,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             environment.etc."home-assistant/configuration.yaml".source = ./configuration.yaml;
diff --git a/modules/features/jellyfin.nix b/modules/features/jellyfin.nix
index e221762..4d44dab 100644
--- a/modules/features/jellyfin.nix
+++ b/modules/features/jellyfin.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.jellyfin = { config, lib, pkgs, ... }: let
 
@@ -8,6 +8,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             networking.firewall.allowedUDPPorts = [ 7359 ];
diff --git a/modules/features/n8n.nix b/modules/features/n8n.nix
index 8519ff0..25e358a 100644
--- a/modules/features/n8n.nix
+++ b/modules/features/n8n.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.n8n = { config, lib, pkgs, ... }: let
 
@@ -8,6 +8,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
 
diff --git a/modules/features/netbird/netbird.nix b/modules/features/netbird/netbird.nix
index aefa5a1..95a0dc1 100644
--- a/modules/features/netbird/netbird.nix
+++ b/modules/features/netbird/netbird.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
 
 
     flake.nixosModules.netbird = { config, lib, pkgs, ... }: {
@@ -33,6 +33,11 @@
 
     flake.nixosModules.netbird-docker = { config, lib, pkgs, ... }: {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             networking.firewall.allowedUDPPorts = [ 3478 ];
diff --git a/modules/features/ollama.nix b/modules/features/ollama.nix
index 750c9bb..5e7706f 100644
--- a/modules/features/ollama.nix
+++ b/modules/features/ollama.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
 
     flake.nixosModules.ollama = { config, lib, ... }: {
 
@@ -29,6 +29,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             environment.systemPackages = with pkgs; [
diff --git a/modules/features/openwebui.nix b/modules/features/openwebui.nix
index 8391bb4..c812418 100644
--- a/modules/features/openwebui.nix
+++ b/modules/features/openwebui.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.openwebui = { config, lib, pkgs, ... }: let
 
@@ -8,6 +8,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             virtualisation.oci-containers.containers.openwebui = {
diff --git a/modules/features/pihole.nix b/modules/features/pihole.nix
index 3b87ab3..56ccbf2 100644
--- a/modules/features/pihole.nix
+++ b/modules/features/pihole.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.pihole = { config, lib, ... }: let
 
@@ -10,6 +10,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             virtualisation.docker.daemon.settings.dns = [ "192.168.101.12" ];
diff --git a/modules/features/portainer.nix b/modules/features/portainer.nix
index 4c5f4bf..e83e3d1 100644
--- a/modules/features/portainer.nix
+++ b/modules/features/portainer.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.portainer = { config, lib, ... }: let
 
@@ -10,6 +10,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             networking.firewall.interfaces = {
diff --git a/modules/features/searxng/searxng.nix b/modules/features/searxng/searxng.nix
index d8f01cb..9c56d64 100644
--- a/modules/features/searxng/searxng.nix
+++ b/modules/features/searxng/searxng.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.searxng = { config, lib, ... }: let
 
@@ -8,6 +8,11 @@
 
     in {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             environment.etc."searxng/settings.yml".source = ./settings.yml;
diff --git a/modules/features/traefik/traefik.nix b/modules/features/traefik/traefik.nix
index 479d67b..7f162d8 100644
--- a/modules/features/traefik/traefik.nix
+++ b/modules/features/traefik/traefik.nix
@@ -1,7 +1,12 @@
-{ ... }: {
+{ self, ... }: {
 
     flake.nixosModules.traefik = { config, lib, ... }: {
 
+        imports = [
+            self.nixosModules.docker
+        ];
+
+
         config = {
 
             networking.firewall.allowedTCPPorts = [ 80 81 443 444 2222 ];
diff --git a/modules/hosts/homebox/configuration.nix b/modules/hosts/homebox/configuration.nix
index 04b3c0e..666ed7e 100644
--- a/modules/hosts/homebox/configuration.nix
+++ b/modules/hosts/homebox/configuration.nix
@@ -3,13 +3,32 @@
 
     flake.nixosModules.homebox = { config, pkgs, lib, ... }:
     {
-        imports =
-            [
+        imports = with self.nixosModules; [
                 inputs.disko.nixosModules.default
 
                 inputs.home-manager.nixosModules.default
             
                 self.nixosModules.default
+                pipewire
+                avahi
+                netbird
+                openssh
+
+                docker
+
+                traefik
+                searxng
+                home-assistant
+                netbird-docker
+                n8n
+                code-server
+                gitea
+                jellyfin
+                nginx
+                ollama-docker
+                openwebui
+                pihole
+                portainer
 
             ];
 
diff --git a/modules/hosts/homebox/default.nix b/modules/hosts/homebox/default.nix
index d278b2c..48cda9a 100644
--- a/modules/hosts/homebox/default.nix
+++ b/modules/hosts/homebox/default.nix
@@ -3,7 +3,7 @@
     flake.nixosConfigurations."homebox" = inputs.nixpkgs.lib.nixosSystem {
 
         modules = with self.nixosModules; [
-            (user-nathan "laptop")
+            user-nathan
             homebox
             homebox-hardware
             self.diskoConfigurations.homebox
diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix
index cfcb611..2ba04d0 100644
--- a/modules/hosts/laptop/configuration.nix
+++ b/modules/hosts/laptop/configuration.nix
@@ -7,7 +7,6 @@
         imports = with self.nixosModules; [
             inputs.home-manager.nixosModules.default
 
-            self.nixosModules.default
             self.nixosModules.default
             aurora-greeter
             hyprland