diff --git a/.cirrus.yml b/.cirrus.yml
index 058ea3e..72bb837 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ task:
 
   container:
     # Defined in https://github.com/nix-community/docker-nixpkgs
-    image: nixpkgs/nix-flakes:nixos-24.11
+    image: nixpkgs/nix-flakes:nixos-25.05
 
   matrix:
     - name: modules_test
diff --git a/dev/README.md b/dev/README.md
index fce515e..ff6c038 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -97,5 +97,5 @@ It's easiest to use an existing service as a template:
   Most other services use packages that are already included in nixpkgs.
 
 ## Switching to a new NixOS release
-- Run command `update-flake.sh 24.11`
+- Run command `update-flake.sh 25.05`
 - Treewide: check if any `TODO-EXTERNAL` comments can be resolved
diff --git a/examples/configuration.nix b/examples/configuration.nix
index 0f4918f..3987529 100644
--- a/examples/configuration.nix
+++ b/examples/configuration.nix
@@ -318,7 +318,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "25.05"; # Did you read the comment?
 
   # The nix-bitcoin release version that your config is compatible with.
   # When upgrading to a backwards-incompatible release, nix-bitcoin will display an
diff --git a/examples/container/flake.nix b/examples/container/flake.nix
index c3aef68..9401c14 100644
--- a/examples/container/flake.nix
+++ b/examples/container/flake.nix
@@ -12,7 +12,7 @@
   inputs = {
     nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
     # You can also use a version branch to track a specific NixOS release
-    # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-24.11";
+    # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.05";
 
     nixpkgs.follows = "nix-bitcoin/nixpkgs";
     nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";
diff --git a/examples/flakes/flake.nix b/examples/flakes/flake.nix
index 63b69c4..dce09b7 100644
--- a/examples/flakes/flake.nix
+++ b/examples/flakes/flake.nix
@@ -10,7 +10,7 @@
 
   inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
   # You can also use a version branch to track a specific NixOS release
-  # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-24.11";
+  # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.05";
 
   inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs";
   inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";
diff --git a/flake.lock b/flake.lock
index 5020ca7..87aae64 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,16 +44,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748037224,
-        "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
+        "lastModified": 1749237914,
+        "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
+        "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b5dd486..fd7aec5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
   '';
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     extra-container = {
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 1b71d26..46407d6 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -2,13 +2,6 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    extra-container
-    hwi
-    lightning-loop
-    lightning-pool
-    lndconnect;
-
-  inherit (pkgsUnstable)
     bitcoin
     bitcoind
     bitcoind-knots
@@ -18,8 +11,16 @@ pkgs: pkgsUnstable:
     clightning
     electrs
     elementsd
+    extra-container
     fulcrum
-    lnd;
+    hwi
+    lightning-loop
+    lightning-pool
+    lnd
+    lndconnect;
+
+  inherit (pkgsUnstable)
+    ;
 
   inherit pkgs pkgsUnstable;
 }