diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index a0a581f..335596e 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -26,8 +26,8 @@ nixpkgs.lib.nixosSystem {
     };
   modules = builtins.attrValues modules ++ [
     ../machines/base.nix
-    inputs.sops-nix.nixosModules.sops
     host-config
+    inputs.sops-nix.nixosModules.sops
     home-manager.nixosModules.home-manager
     inputs.simple-nixos-mailserver.nixosModule
     inputs.attic.nixosModules.atticd
@@ -36,7 +36,6 @@ nixpkgs.lib.nixosSystem {
     inputs.buildbot-nix.nixosModules.buildbot-master
     inputs.buildbot-nix.nixosModules.buildbot-worker
     inputs.nix-hash-collection.nixosModules.hash-collection
-
     inputs.nur.nixosModules.nur
     {
       home-manager.useGlobalPkgs = true;
@@ -48,22 +47,14 @@ nixpkgs.lib.nixosSystem {
             waybar = prev.waybar.overrideAttrs (oldAttrs: {
               mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
             });
-            tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
-            inherit (prev.unstable) jackett;
-            inherit (prev.unstable) radarr;
-            htpdate = prev.pkgs.callPackage ../packages/htpdate { };
-            authelia = prev.pkgs.callPackage ../packages/authelia { };
-            paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
-            inherit (prev.unstable) tailscale;
-            inherit (prev.unstable) nodePackages;
-            hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
-            inherit (prev.unstable) mosh;
+            # Packages comming from other repositories
             attic = inputs.attic.packages.${system}.default;
             inherit (inputs.colmena.packages.${system}) colmena;
-            keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
-            nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
             inherit (prev.unstable) bcachefs-tools;
             zotero = inputs.zotero-nix.packages.${system}.default;
+            # My own packages
+            keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
+            hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
           })
       ];
     }
diff --git a/modules/deluge/default.nix b/modules/deluge/default.nix
index 52f6d3f..ab3678f 100644
--- a/modules/deluge/default.nix
+++ b/modules/deluge/default.nix
@@ -39,8 +39,7 @@ in
 
       services.deluge = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        inherit (cfg) user group;
         openFirewall = true;
         declarative = true;
         authFile = "/run/secrets/deluge";
@@ -55,9 +54,9 @@ in
     }
 
 
-      
+
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
- 
+
 
 
 }
diff --git a/modules/hydra/default.nix b/modules/hydra/default.nix
index f0e64da..384a9df 100644
--- a/modules/hydra/default.nix
+++ b/modules/hydra/default.nix
@@ -18,9 +18,9 @@ in
     mkMerge [{
 
       services.hydra = {
+        inherit port;
         enable = true;
         notificationSender = "hydra@localhost";
-        inherit port;
         buildMachinesFiles = [ ];
         useSubstitutes = true;
       };
@@ -28,9 +28,11 @@ in
       networking.firewall = { allowedTCPPorts = [ port ]; };
     }
 
-      (mkIf cfg.nginx.enable (recursiveUpdate {
-        services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
-      } (mkSubdomain cfg.nginx.subdomain port)) )]);
+      (mkIf cfg.nginx.enable (recursiveUpdate
+        {
+          services.hydra.hydraURL = "${cfg.nginx.subdomain}.julienmalka.me";
+        }
+        (mkSubdomain cfg.nginx.subdomain port)))]);
 
 
 
diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix
index 05d892a..9a3ea41 100644
--- a/modules/jackett/default.nix
+++ b/modules/jackett/default.nix
@@ -32,14 +32,14 @@ in
     mkMerge [{
       services.jackett = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        package = pkgs.unstable.jackett;
+        inherit (cfg) user group;
       };
 
     }
 
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
- 
+
 
 
 
diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix
index 25ab3ee..fb7edc5 100644
--- a/modules/jellyfin/default.nix
+++ b/modules/jellyfin/default.nix
@@ -32,47 +32,16 @@ in
     mkMerge [{
       services.jellyfin = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        inherit (cfg) user group;
       };
 
-      #      services.nginx.appendHttpConfig = ''
-      #       server {
-      #           server_name tv.julienmalka.me;
-      #           listen 80;
-      #           return 301 https://$server_name$request_uri;
-      #       }
-
-      #      server {
-      #          server_name tv.julienmalka.me;
-      #          listen 443 ssl http2;
-
-      #         include ${../authelia/authelia.conf}; # Authelia auth endpoint
-
-      #        location / {
-      #           proxy_pass http://127.0.0.1:8096;
-      #   	    proxy_set_header Host $host;
-      # proxy_set_header X-Real-IP $remote_addr;
-      # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      #  	    include ${../authelia/secure.conf}; # Protect this endpoint
-      #      }
-      #  }
-      # '';
-
-
-
-
-      
-
-
     }
 
-      (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))     
+      (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
-      
-    
-      
+
+
+
 
 
 
diff --git a/modules/lidarr/default.nix b/modules/lidarr/default.nix
index 93448e8..02844d6 100644
--- a/modules/lidarr/default.nix
+++ b/modules/lidarr/default.nix
@@ -33,14 +33,13 @@ in
     mkMerge [{
       services.lidarr = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        inherit (cfg) user group;
       };
     }
 
-      
+
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
- 
+
 
 
 
diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix
index e82fe83..32795f8 100644
--- a/modules/radarr/default.nix
+++ b/modules/radarr/default.nix
@@ -33,13 +33,13 @@ in
     mkMerge [{
       services.radarr = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        package = pkgs.unstable.radarr;
+        inherit (cfg) user group;
       };
     }
-      
+
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
- 
+
 
 
 
diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix
index 73cdae5..ca3ceb7 100644
--- a/modules/sonarr/default.nix
+++ b/modules/sonarr/default.nix
@@ -33,8 +33,7 @@ in
     mkMerge [{
       services.sonarr = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        inherit (cfg) user group;
       };
     }
 
diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix
index 85a6898..9a90aaa 100644
--- a/modules/transmission/default.nix
+++ b/modules/transmission/default.nix
@@ -39,8 +39,7 @@ in
 
       services.transmission = {
         enable = true;
-        inherit (cfg) user;
-        inherit (cfg) group;
+        inherit (cfg) user group;
         credentialsFile = "/run/secrets/transmission";
         downloadDirPermissions = "770";
         settings = {
@@ -52,7 +51,7 @@ in
       };
     }
 
-      (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port) )]);
+      (mkIf cfg.nginx.enable (mkSubdomain cfg.nginx.subdomain port))]);