diff --git a/docs/_releasenotes/x.change.1.nixos-24.05 b/docs/_releasenotes/x.change.1.nixos-24.05
new file mode 100644
index 0000000000000000000000000000000000000000..40d544ebc68f770735dd7ff6cd08597770dd7688
--- /dev/null
+++ b/docs/_releasenotes/x.change.1.nixos-24.05
@@ -0,0 +1 @@
+We are now following the stable NixOS branch
diff --git a/flake.lock b/flake.lock
index 8d2124369b18472f13b297e46f7a904ebd687309..45431b385ff0c65156b623228f5cfe7039329d23 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742272065,
-        "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3549532663732bfd89993204d40543e9edaec4f2",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 2575c66a92d691fc21599a63cd9969b684fed9c1..b17359e5474041236dadd422b3a7f535c0d6df86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
   inputs.nixpkgs-terraform157.url = "github:NixOS/nixpkgs/39ed4b64ba5929e8e9221d06b719a758915e619b";
   inputs.nixpkgs-vault1148.url = "github:NixOS/nixpkgs/7cf8d6878561e8b2e4b1186f79f1c0e66963bdac";
   inputs.flake-parts.url = "github:hercules-ci/flake-parts";
diff --git a/nix/dependencies.nix b/nix/dependencies.nix
index 5952ab1b7d75a2bac868b8b874d0b1348f49f39b..5c4d29698cec308bb877b8539bec3471558b8cfe 100644
--- a/nix/dependencies.nix
+++ b/nix/dependencies.nix
@@ -35,7 +35,6 @@
           moreutils
           openssh
           openssl
-          openstackclient-full
           pre-commit
           inputs'.nixpkgs-terraform157.legacyPackages.terraform
           util-linux # for uuidgen
@@ -49,6 +48,7 @@
             openshift
             loguru
             packaging
+            python-openstackclient
             jsonschema
             hvac
             boto3