diff --git a/templates/numbus-server/sops-nix/.sops.yaml b/templates/numbus-server/.sops.yaml
similarity index 66%
rename from templates/numbus-server/sops-nix/.sops.yaml
rename to templates/numbus-server/.sops.yaml
index de69314..3d1bc9d 100644
--- a/templates/numbus-server/sops-nix/.sops.yaml
+++ b/templates/numbus-server/.sops.yaml
@@ -3,7 +3,7 @@
 keys:
   - &primary $SOPS_PUBLIC_KEY
 creation_rules:
-  - path_regex: secrets/secrets.yaml$
+  - path_regex: secrets/(disks|podman|system)/.*\.yaml$
     key_groups:
     - age:
       - *primary
\ No newline at end of file
diff --git a/templates/numbus-server/configuration.nix b/templates/numbus-server/configuration.nix
deleted file mode 100644
index 8c1c408..0000000
--- a/templates/numbus-server/configuration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# Do NOT edit this file manually. 
-# Please use the dedicated script : https://gittea.dev/numbus/numbus.
-# This could compromise system stability and is not supported by numbus.
-
-{ config, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    (modulesPath + "/profiles/qemu-guest.nix")
-    ./custom-configuration.nix
-    ./numbus-generated.nix
-  ];
-
-  # System
-  system.stateVersion = "25.11";
-}
\ No newline at end of file
diff --git a/templates/numbus-server/custom-configuration.nix b/templates/numbus-server/custom-configuration.nix
index 23e44ad..95a8719 100644
--- a/templates/numbus-server/custom-configuration.nix
+++ b/templates/numbus-server/custom-configuration.nix
@@ -3,3 +3,6 @@
 # Do NOT set options already managed by numbus. i.e. config.numbus.* and other options (networking, storage, etc.)
 # Please use the dedicated script for those options : https://gittea.dev/numbus/numbus.
 
+{ config }:
+
+{}
\ No newline at end of file
diff --git a/templates/numbus-server/flake.nix b/templates/numbus-server/flake.nix
index 68454d4..604ae26 100644
--- a/templates/numbus-server/flake.nix
+++ b/templates/numbus-server/flake.nix
@@ -7,7 +7,7 @@
     # Core Nixpkgs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     # Numbus server configuration
-    numbus-server.url = "git+https://gittea.dev/numbus/numbus-server";
+    numbus-server.url = "git+https://git.numbus.eu/numbus/numbus-server";
     numbus-server.inputs.nixpkgs.follows = "nixpkgs";
     # Disk-partitioning helper
     disko.url = "github:nix-community/disko";
@@ -43,8 +43,9 @@
           # Power savings
           autoaspm.nixosModules.autoaspm
           # Core host configuration
-          ./configuration.nix
           ./hardware-configuration.nix
+          ./numbus-generated.nix
+          ./custom-configuration.nix
         ];
       };
     };
diff --git a/templates/numbus-server/sops-nix/disks/boot.yaml b/templates/numbus-server/secrets/disks/boot.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/disks/boot.yaml
rename to templates/numbus-server/secrets/disks/boot.yaml
diff --git a/templates/numbus-server/sops-nix/disks/content.yaml b/templates/numbus-server/secrets/disks/content.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/disks/content.yaml
rename to templates/numbus-server/secrets/disks/content.yaml
diff --git a/templates/numbus-server/sops-nix/disks/parity.yaml b/templates/numbus-server/secrets/disks/parity.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/disks/parity.yaml
rename to templates/numbus-server/secrets/disks/parity.yaml
diff --git a/templates/numbus-server/sops-nix/podman/adguard.yaml b/templates/numbus-server/secrets/podman/adguard.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/adguard.yaml
rename to templates/numbus-server/secrets/podman/adguard.yaml
diff --git a/templates/numbus-server/sops-nix/podman/authelia.yaml b/templates/numbus-server/secrets/podman/authelia.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/authelia.yaml
rename to templates/numbus-server/secrets/podman/authelia.yaml
diff --git a/templates/numbus-server/sops-nix/podman/crafty.yaml b/templates/numbus-server/secrets/podman/crafty.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/crafty.yaml
rename to templates/numbus-server/secrets/podman/crafty.yaml
diff --git a/templates/numbus-server/sops-nix/podman/dashy.yaml b/templates/numbus-server/secrets/podman/dashy.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/dashy.yaml
rename to templates/numbus-server/secrets/podman/dashy.yaml
diff --git a/templates/numbus-server/sops-nix/podman/frigate.yaml b/templates/numbus-server/secrets/podman/frigate.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/frigate.yaml
rename to templates/numbus-server/secrets/podman/frigate.yaml
diff --git a/templates/numbus-server/sops-nix/podman/gitea.yaml b/templates/numbus-server/secrets/podman/gitea.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/gitea.yaml
rename to templates/numbus-server/secrets/podman/gitea.yaml
diff --git a/templates/numbus-server/sops-nix/podman/gitlab.yaml b/templates/numbus-server/secrets/podman/gitlab.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/gitlab.yaml
rename to templates/numbus-server/secrets/podman/gitlab.yaml
diff --git a/templates/numbus-server/sops-nix/podman/home-assistant.yaml b/templates/numbus-server/secrets/podman/home-assistant.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/home-assistant.yaml
rename to templates/numbus-server/secrets/podman/home-assistant.yaml
diff --git a/templates/numbus-server/sops-nix/podman/homepage.yaml b/templates/numbus-server/secrets/podman/homepage.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/homepage.yaml
rename to templates/numbus-server/secrets/podman/homepage.yaml
diff --git a/templates/numbus-server/sops-nix/podman/immich.yaml b/templates/numbus-server/secrets/podman/immich.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/immich.yaml
rename to templates/numbus-server/secrets/podman/immich.yaml
diff --git a/templates/numbus-server/sops-nix/podman/it-tools.yaml b/templates/numbus-server/secrets/podman/it-tools.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/it-tools.yaml
rename to templates/numbus-server/secrets/podman/it-tools.yaml
diff --git a/templates/numbus-server/sops-nix/podman/jellyfin.yaml b/templates/numbus-server/secrets/podman/jellyfin.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/jellyfin.yaml
rename to templates/numbus-server/secrets/podman/jellyfin.yaml
diff --git a/templates/numbus-server/sops-nix/podman/lldap.yaml b/templates/numbus-server/secrets/podman/lldap.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/lldap.yaml
rename to templates/numbus-server/secrets/podman/lldap.yaml
diff --git a/templates/numbus-server/sops-nix/podman/n8n.yaml b/templates/numbus-server/secrets/podman/n8n.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/n8n.yaml
rename to templates/numbus-server/secrets/podman/n8n.yaml
diff --git a/templates/numbus-server/sops-nix/podman/netbird.yaml b/templates/numbus-server/secrets/podman/netbird.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/netbird.yaml
rename to templates/numbus-server/secrets/podman/netbird.yaml
diff --git a/templates/numbus-server/sops-nix/podman/netbootxyz.yaml b/templates/numbus-server/secrets/podman/netbootxyz.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/netbootxyz.yaml
rename to templates/numbus-server/secrets/podman/netbootxyz.yaml
diff --git a/templates/numbus-server/sops-nix/podman/netbox.yaml b/templates/numbus-server/secrets/podman/netbox.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/netbox.yaml
rename to templates/numbus-server/secrets/podman/netbox.yaml
diff --git a/templates/numbus-server/sops-nix/podman/nextcloud.yaml b/templates/numbus-server/secrets/podman/nextcloud.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/nextcloud.yaml
rename to templates/numbus-server/secrets/podman/nextcloud.yaml
diff --git a/templates/numbus-server/sops-nix/podman/ntfy.yaml b/templates/numbus-server/secrets/podman/ntfy.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/ntfy.yaml
rename to templates/numbus-server/secrets/podman/ntfy.yaml
diff --git a/templates/numbus-server/sops-nix/podman/odoo.yaml b/templates/numbus-server/secrets/podman/odoo.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/odoo.yaml
rename to templates/numbus-server/secrets/podman/odoo.yaml
diff --git a/templates/numbus-server/sops-nix/podman/passbolt.yaml b/templates/numbus-server/secrets/podman/passbolt.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/passbolt.yaml
rename to templates/numbus-server/secrets/podman/passbolt.yaml
diff --git a/templates/numbus-server/sops-nix/podman/pi-hole.yaml b/templates/numbus-server/secrets/podman/pi-hole.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/pi-hole.yaml
rename to templates/numbus-server/secrets/podman/pi-hole.yaml
diff --git a/templates/numbus-server/sops-nix/podman/traefik.yaml b/templates/numbus-server/secrets/podman/traefik.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/traefik.yaml
rename to templates/numbus-server/secrets/podman/traefik.yaml
diff --git a/templates/numbus-server/sops-nix/podman/uptime-kuma.yaml b/templates/numbus-server/secrets/podman/uptime-kuma.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/uptime-kuma.yaml
rename to templates/numbus-server/secrets/podman/uptime-kuma.yaml
diff --git a/templates/numbus-server/sops-nix/podman/vscodium.yaml b/templates/numbus-server/secrets/podman/vscodium.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/podman/vscodium.yaml
rename to templates/numbus-server/secrets/podman/vscodium.yaml
diff --git a/templates/numbus-server/sops-nix/system/backup-client.yaml b/templates/numbus-server/secrets/system/backup-client.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/system/backup-client.yaml
rename to templates/numbus-server/secrets/system/backup-client.yaml
diff --git a/templates/numbus-server/sops-nix/system/clamav.yaml b/templates/numbus-server/secrets/system/clamav.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/system/clamav.yaml
rename to templates/numbus-server/secrets/system/clamav.yaml
diff --git a/templates/numbus-server/sops-nix/system/mail.yaml b/templates/numbus-server/secrets/system/mail.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/system/mail.yaml
rename to templates/numbus-server/secrets/system/mail.yaml
diff --git a/templates/numbus-server/sops-nix/system/ssh.yaml b/templates/numbus-server/secrets/system/ssh.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/system/ssh.yaml
rename to templates/numbus-server/secrets/system/ssh.yaml
diff --git a/templates/numbus-server/sops-nix/system/virtualization.yaml b/templates/numbus-server/secrets/system/virtualization.yaml
similarity index 100%
rename from templates/numbus-server/sops-nix/system/virtualization.yaml
rename to templates/numbus-server/secrets/system/virtualization.yaml