diff --git a/docs/default.nix b/docs/default.nix
index 1b11db10..190c8ca7 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { pkgs, home-manager, nmdSrc }:
 
diff --git a/flake.nix b/flake.nix
index 2ce345f6..a62fd552 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,9 +5,9 @@
     nixpkgs.url = "github:NixOS/nixpkgs";
 
     # for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence.
-    # head of nixos-23.11 as of 2024-02-17
+    # head of nixos-24.05 as of 2024-06-05
     # note: when updating nixpkgs-for-bootstrap, update store paths of proot-termux in modules/environment/login/default.nix
-    nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/1d1817869c47682a6bee85b5b0a6537b6c0fba26";
+    nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -19,7 +19,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixpkgs-docs.url = "github:NixOS/nixpkgs/release-23.11";
+    nixpkgs-docs.url = "github:NixOS/nixpkgs/release-24.05";
 
     nmd = {
       url = "sourcehut:~rycee/nmd";
diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix
index 79490132..0527b61c 100644
--- a/modules/build/initial-build.nix
+++ b/modules/build/initial-build.nix
@@ -5,8 +5,8 @@
 with lib;
 
 let
-  defaultNixpkgsBranch = "nixos-23.11";
-  defaultNixOnDroidBranch = "release-23.11";
+  defaultNixpkgsBranch = "nixos-24.05";
+  defaultNixOnDroidBranch = "release-24.05";
 
   defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}";
   defaultNixOnDroidChannel = "https://github.com/nix-community/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz";
diff --git a/modules/environment/session-init.nix b/modules/environment/session-init.nix
index 14aa8297..5cabe804 100644
--- a/modules/environment/session-init.nix
+++ b/modules/environment/session-init.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { config, lib, pkgs, ... }:
 
diff --git a/modules/upgrade.nix b/modules/upgrade.nix
index 62fe139f..51f289c0 100644
--- a/modules/upgrade.nix
+++ b/modules/upgrade.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { config, lib, ... }:
 
diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix
index 21674d43..224a2cd0 100644
--- a/overlays/lib/nixpkgs.nix
+++ b/overlays/lib/nixpkgs.nix
@@ -1,14 +1,14 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { super }:
 
 let
-  # head of nixos-23.11 as of 2024-02-17
+  # head of nixos-24.05 as of 2024-06-05
   pinnedPkgsSrc = super.fetchFromGitHub {
     owner = "NixOS";
     repo = "nixpkgs";
-    rev = "1d1817869c47682a6bee85b5b0a6537b6c0fba26";
-    sha256 = "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=";
+    rev = "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1";
+    sha256 = "";
   };
 in
 
diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix
index d8dff547..ffea6509 100644
--- a/pkgs/cross-compiling/talloc-static.nix
+++ b/pkgs/cross-compiling/talloc-static.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { callPackage
 , fetchurl
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b5353f5b..13bb8c50 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -35,7 +35,7 @@ let
         pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix
       };
 
-      system.stateVersion = "23.11";
+      system.stateVersion = "24.05";
 
       # Fix invoking bash after initial build.
       user.shell = "${initialPackageInfo.bash}/bin/bash";
diff --git a/pkgs/proot-termux/default.nix b/pkgs/proot-termux/default.nix
index 06e4b4dd..d3bc0a03 100644
--- a/pkgs/proot-termux/default.nix
+++ b/pkgs/proot-termux/default.nix
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
+# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
 
 { stdenv
 , fetchFromGitHub
diff --git a/templates/advanced/flake.nix b/templates/advanced/flake.nix
index 24066d5f..26b63e3f 100644
--- a/templates/advanced/flake.nix
+++ b/templates/advanced/flake.nix
@@ -2,15 +2,15 @@
   description = "Advanced example of Nix-on-Droid system config with home-manager.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.11";
+      url = "github:nix-community/nix-on-droid/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
diff --git a/templates/advanced/home.nix b/templates/advanced/home.nix
index 958bf39c..bcd9a86b 100644
--- a/templates/advanced/home.nix
+++ b/templates/advanced/home.nix
@@ -2,7 +2,7 @@
 
 {
   # Read the changelog before changing this value
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 
   # insert home-manager config
 }
diff --git a/templates/advanced/nix-on-droid.nix b/templates/advanced/nix-on-droid.nix
index fab9a35c..dea6b3e7 100644
--- a/templates/advanced/nix-on-droid.nix
+++ b/templates/advanced/nix-on-droid.nix
@@ -30,7 +30,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   # Set up nix for flakes
   nix.extraOptions = ''
diff --git a/templates/home-manager/flake.nix b/templates/home-manager/flake.nix
index eaf07b8f..498e8bfd 100644
--- a/templates/home-manager/flake.nix
+++ b/templates/home-manager/flake.nix
@@ -2,15 +2,15 @@
   description = "Minimal example of Nix-on-Droid system config with home-manager.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.11";
+      url = "github:nix-community/nix-on-droid/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
diff --git a/templates/home-manager/nix-on-droid.nix b/templates/home-manager/nix-on-droid.nix
index c1706ffa..e4033f37 100644
--- a/templates/home-manager/nix-on-droid.nix
+++ b/templates/home-manager/nix-on-droid.nix
@@ -30,7 +30,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   # Set up nix for flakes
   nix.extraOptions = ''
@@ -49,7 +49,7 @@
       { config, lib, pkgs, ... }:
       {
         # Read the changelog before changing this value
-        home.stateVersion = "23.11";
+        home.stateVersion = "24.05";
 
         # insert home-manager config
       };
diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix
index ab4da671..70faf6ec 100644
--- a/templates/minimal/flake.nix
+++ b/templates/minimal/flake.nix
@@ -2,10 +2,10 @@
   description = "Basic example of Nix-on-Droid system config.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.11";
+      url = "github:nix-community/nix-on-droid/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/templates/minimal/nix-on-droid.nix b/templates/minimal/nix-on-droid.nix
index c5d50d80..99a63341 100644
--- a/templates/minimal/nix-on-droid.nix
+++ b/templates/minimal/nix-on-droid.nix
@@ -30,7 +30,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   # Set up nix for flakes
   nix.extraOptions = ''
diff --git a/tests/on-device/config-flake-default.nix b/tests/on-device/config-flake-default.nix
index a3a7d24d..d4695048 100644
--- a/tests/on-device/config-flake-default.nix
+++ b/tests/on-device/config-flake-default.nix
@@ -2,7 +2,7 @@
   description = "Nix-on-Droid configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
     nix-on-droid.url = "<<FLAKE_URL>>";
     nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
   };
diff --git a/tests/on-device/config-flake-h-m.cfg.nix b/tests/on-device/config-flake-h-m.cfg.nix
index dfc9c4f3..fb729d0a 100644
--- a/tests/on-device/config-flake-h-m.cfg.nix
+++ b/tests/on-device/config-flake-h-m.cfg.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 
 {
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   # no nixpkgs.overlays defined
   environment.packages = with pkgs; [ zsh ];
@@ -9,7 +9,7 @@
   home-manager.config =
     { pkgs, ... }:
     {
-      home.stateVersion = "23.11";
+      home.stateVersion = "24.05";
 
       nixpkgs.overlays = config.nixpkgs.overlays;
       home.packages = with pkgs; [ dash ];
diff --git a/tests/on-device/config-flake-h-m.flake.nix b/tests/on-device/config-flake-h-m.flake.nix
index fa98ad05..bb6a44f0 100644
--- a/tests/on-device/config-flake-h-m.flake.nix
+++ b/tests/on-device/config-flake-h-m.flake.nix
@@ -2,8 +2,8 @@
   description = "Nix-on-Droid configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     nix-on-droid = {
       url = "<<FLAKE_URL>>";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/tests/on-device/config-flake-hosts-localhost.cfg.nix b/tests/on-device/config-flake-hosts-localhost.cfg.nix
index 157308a5..5b2d06ac 100644
--- a/tests/on-device/config-flake-hosts-localhost.cfg.nix
+++ b/tests/on-device/config-flake-hosts-localhost.cfg.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   networking.hosts."127.0.0.2" = [ "localhost" ];
 }
diff --git a/tests/on-device/config-flake-hosts.cfg.nix b/tests/on-device/config-flake-hosts.cfg.nix
index a633fa34..1df64835 100644
--- a/tests/on-device/config-flake-hosts.cfg.nix
+++ b/tests/on-device/config-flake-hosts.cfg.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   networking = {
     hosts."127.0.0.2" = [ "a" "b" ];
diff --git a/tests/on-device/config-flake.nix b/tests/on-device/config-flake.nix
index 1caa8a6a..26f5e711 100644
--- a/tests/on-device/config-flake.nix
+++ b/tests/on-device/config-flake.nix
@@ -2,7 +2,7 @@
   description = "Nix-on-Droid configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
     nix-on-droid.url = "<<FLAKE_URL>>";
     nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
   };
diff --git a/tests/on-device/config-h-m.nix b/tests/on-device/config-h-m.nix
index be8bd391..31ce19eb 100644
--- a/tests/on-device/config-h-m.nix
+++ b/tests/on-device/config-h-m.nix
@@ -1,12 +1,12 @@
 { pkgs, config, ... }:
 
 {
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   home-manager.config =
     { pkgs, lib, ... }:
     {
-      home.stateVersion = "23.11";
+      home.stateVersion = "24.05";
       nixpkgs = { inherit (config.nixpkgs) overlays; };
 
       # example config
diff --git a/tests/on-device/config-term-colors.nix b/tests/on-device/config-term-colors.nix
index ec3d8f4a..6667b096 100644
--- a/tests/on-device/config-term-colors.nix
+++ b/tests/on-device/config-term-colors.nix
@@ -1,7 +1,7 @@
 _:
 
 {
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
   terminal.colors = {
     background = "#FFFFFF";
     foreground = "#000000";