diff --git a/flake.nix b/flake.nix
index cd47e6d..999c5ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,6 +110,7 @@
               })
               sops.nixosModules.sops
               inputs.sunshine.nixosModules.sunshine
+              inputs.hyprland.nixosModules.default
             ];
           };
       in
diff --git a/machines/drone/configuration.nix b/machines/drone/configuration.nix
index 0016258..49c5aa4 100644
--- a/machines/drone/configuration.nix
+++ b/machines/drone/configuration.nix
@@ -7,7 +7,6 @@
 
   eboskma = {
     users.erwin.enable = true;
-    docker.enable = true;
     drone.enable = true;
     nix-common = {
       enable = true;
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 6819b5b..c0fa6e1 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -9,8 +9,6 @@ in
     nixos-hardware.nixosModules.common-gpu-amd
     nixos-hardware.nixosModules.common-pc-ssd
 
-    hyprland.nixosModules.default
-
     ./hardware-configuration.nix
     ../../users/erwin
     ../../users/root
diff --git a/machines/proxy/configuration.nix b/machines/proxy/configuration.nix
index d64c33f..7ef74da 100644
--- a/machines/proxy/configuration.nix
+++ b/machines/proxy/configuration.nix
@@ -7,7 +7,6 @@
 
   eboskma = {
     users.erwin.enable = true;
-    docker.enable = true;
     nix-common = {
       enable = true;
       remote-builders = true;
diff --git a/modules/drone/default.nix b/modules/drone/default.nix
index c60f77d..c2a8a1a 100644
--- a/modules/drone/default.nix
+++ b/modules/drone/default.nix
@@ -12,8 +12,14 @@ in
   };
 
   config = mkIf cfg.enable {
-    eboskma.docker.enable = true;
-
+    virtualisation.docker = {
+      enable = true;
+      autoPrune = {
+        enable = true;
+        dates = "weekly";
+      };
+    };
+    
     virtualisation.oci-containers.containers = {
       drone = {
         autoStart = true;
@@ -37,5 +43,7 @@ in
         ];
       };
     };
+
+    users.users.${config.eboskma.var.mainUser}.extraGroups = [ "docker" ];
   };
 }
diff --git a/modules/nginx-proxy-manager/default.nix b/modules/nginx-proxy-manager/default.nix
index a134f1c..5ff3af4 100644
--- a/modules/nginx-proxy-manager/default.nix
+++ b/modules/nginx-proxy-manager/default.nix
@@ -10,8 +10,14 @@ in
   options.eboskma.nginx-proxy-manager = { enable = mkEnableOption "Nginx Proxy Manager"; };
 
   config = mkIf cfg.enable {
-    eboskma.docker.enable = true;
-
+    virtualisation.docker = {
+      enable = true;
+      autoPrune = {
+        enable = true;
+        dates = "weekly";
+      };
+    };
+    
     virtualisation.oci-containers.containers = {
       nginx-proxy-manager = {
         autoStart = true;
@@ -28,5 +34,6 @@ in
         ];
       };
     };
+    users.users.${config.eboskma.var.mainUser}.extraGroups = [ "docker" ];
   };
 }
diff --git a/users/root/default.nix b/users/root/default.nix
index b106baf..e3d0ef0 100644
--- a/users/root/default.nix
+++ b/users/root/default.nix
@@ -3,7 +3,7 @@
     openssh.authorizedKeys.keyFiles = [
       (pkgs.fetchurl {
         url = "https://github.com/eboskma.keys";
-        sha256 = "z/4lQnFuSkq8O0eunnkXIAH3x3ii9qVr9hxh4/8jBkc=";
+        sha256 = "uwK4FSLSHiwCJU9U7RBFHIoCmr7uUQLM0JM1u0bi4xo=";
       })
     ];
   };