diff --git a/nixos-infra/environments/dev/configuration.nix b/nixos-infra/environments/dev/configuration.nix
new file mode 100644
index 0000000..7e6af6c
--- /dev/null
+++ b/nixos-infra/environments/dev/configuration.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }:
+
+let
+  # Pin to the same framework commit as production — update when testing
+  # new framework features in dev before rolling to production.
+  frameworkRev = "c53d997d075236f6d8c2a8e9db0238e46391735a";
+  framework = builtins.fetchGit {
+    url = "ssh://git@gitea.prod.lagraula.fr:2222/xavier/nixos-infra-framework.git";
+    rev = frameworkRev;
+  };
+in {
+  imports = [
+    (framework + "/lib")
+    (framework + "/overlays/custom-pkgs.nix")
+  ];
+
+  # Dev environment-wide settings
+  system.stateVersion = "25.11";
+}
\ No newline at end of file
diff --git a/nixos-infra/environments/dev/network/.gitkeep b/nixos-infra/environments/dev/network/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/nixos-infra/environments/dev/secrets/.gitkeep b/nixos-infra/environments/dev/secrets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/nixos-infra/environments/stage/configuration.nix b/nixos-infra/environments/stage/configuration.nix
new file mode 100644
index 0000000..2c19ed8
--- /dev/null
+++ b/nixos-infra/environments/stage/configuration.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }:
+
+let
+  # Pin to the same framework commit as production — update when testing
+  # new framework features in staging before rolling to production.
+  frameworkRev = "c53d997d075236f6d8c2a8e9db0238e46391735a";
+  framework = builtins.fetchGit {
+    url = "ssh://git@gitea.prod.lagraula.fr:2222/xavier/nixos-infra-framework.git";
+    rev = frameworkRev;
+  };
+in {
+  imports = [
+    (framework + "/lib")
+    (framework + "/overlays/custom-pkgs.nix")
+  ];
+
+  # Staging environment-wide settings
+  system.stateVersion = "25.11";
+}
\ No newline at end of file
diff --git a/nixos-infra/environments/stage/network/.gitkeep b/nixos-infra/environments/stage/network/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/nixos-infra/environments/stage/secrets/.gitkeep b/nixos-infra/environments/stage/secrets/.gitkeep
new file mode 100644
index 0000000..e69de29