diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1512b..42826b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-## Release 23.11 (unreleased)
+## Release 24.05 (unreleased)
+
+## Release 23.11
 
 ### New Options
 
diff --git a/README.md b/README.md
index 1600473..2e4b0e1 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ for example:
 
 {
   environment.packages = [ pkgs.vim ];
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 }
 ```
 
@@ -67,7 +67,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key
 
     {
       environment.packages = [ pkgs.vim ];
-      system.stateVersion = "23.05";
+      system.stateVersion = "23.11";
     };
 }
 ```
@@ -80,7 +80,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
 
 1.  Add `home-manager` channel:
     ```sh
-    nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+    nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
     nix-channel --update
     ```
 2.  Configure `home-manager`:
@@ -89,7 +89,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
 
     {
       # Read Nix-on-Droid changelog before changing this value
-      system.stateVersion = "23.05";
+      system.stateVersion = "23.11";
 
       # insert Nix-on-Droid config
 
@@ -97,7 +97,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
         { pkgs, ... }:
         {
           # Read home-manager changelog before changing this value
-          home.stateVersion = "23.05";
+          home.stateVersion = "23.11";
 
           # insert home-manager config
         };
@@ -181,10 +181,10 @@ A minimal example could look like the following:
   description = "Minimal example of Nix-on-Droid system config.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.05";
+      url = "github:nix-community/nix-on-droid/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/docs/manual.xml b/docs/manual.xml
index 083de23..78ccb87 100644
--- a/docs/manual.xml
+++ b/docs/manual.xml
@@ -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. -->
 <book xmlns="http://docbook.org/ns/docbook"
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -31,10 +31,10 @@
 <programlisting language="nix">
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.05";
+      url = "github:nix-community/nix-on-droid/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix
index e3dfba5..7949013 100644
--- a/modules/build/initial-build.nix
+++ b/modules/build/initial-build.nix
@@ -1,12 +1,12 @@
-# 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, ... }:
 
 with lib;
 
 let
-  defaultNixpkgsBranch = "nixos-23.05";
-  defaultNixOnDroidBranch = "release-23.05";
+  defaultNixpkgsBranch = "nixos-23.11";
+  defaultNixOnDroidBranch = "release-23.11";
 
   defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}";
   defaultNixOnDroidChannel = "https://github.com/nix-community/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz";
diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default
index 2ae962a..ecccdf6 100644
--- a/modules/environment/login/nix-on-droid.nix.default
+++ b/modules/environment/login/nix-on-droid.nix.default
@@ -28,7 +28,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 
   # Set up nix for flakes
   #nix.extraOptions = ''
@@ -39,7 +39,7 @@
   #time.timeZone = "Europe/Berlin";
 
   # After installing home-manager channel like
-  #   nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+  #   nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
   #   nix-channel --update
   # you can configure home-manager in here like
   #home-manager = {
@@ -49,7 +49,7 @@
   #    { config, lib, pkgs, ... }:
   #    {
   #      # Read the changelog before changing this value
-  #      home.stateVersion = "23.05";
+  #      home.stateVersion = "23.11";
   #
   #      # insert home-manager config
   #    };
diff --git a/modules/version.nix b/modules/version.nix
index eac575c..980204d 100644
--- a/modules/version.nix
+++ b/modules/version.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, ... }:
 
@@ -21,6 +21,7 @@ with lib;
         "22.11"
         "23.05"
         "23.11"
+        "24.05"
       ];
       description = ''
         It is occasionally necessary for Nix-on-Droid to change
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4e7cf70..d7e7744 100644
--- a/pkgs/default.nix
+++ b/pkgs/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.
 
 { nixpkgs
 , system
@@ -35,7 +35,7 @@ let
         pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix
       };
 
-      system.stateVersion = "23.05";
+      system.stateVersion = "23.11";
 
       # Fix invoking bash after initial build.
       user.shell = "${initialPackageInfo.bash}/bin/bash";
diff --git a/templates/advanced/flake.nix b/templates/advanced/flake.nix
index be3b3cf..24066d5 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.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.05";
+      url = "github:nix-community/nix-on-droid/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
diff --git a/templates/advanced/home.nix b/templates/advanced/home.nix
index 74c2493..958bf39 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.05";
+  home.stateVersion = "23.11";
 
   # insert home-manager config
 }
diff --git a/templates/advanced/nix-on-droid.nix b/templates/advanced/nix-on-droid.nix
index 686d786..1591d51 100644
--- a/templates/advanced/nix-on-droid.nix
+++ b/templates/advanced/nix-on-droid.nix
@@ -28,7 +28,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 
   # Set up nix for flakes
   nix.extraOptions = ''
diff --git a/templates/home-manager/flake.nix b/templates/home-manager/flake.nix
index 464a133..eaf07b8 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.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.05";
+      url = "github:nix-community/nix-on-droid/release-23.11";
       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 9b7d262..7a53b8e 100644
--- a/templates/home-manager/nix-on-droid.nix
+++ b/templates/home-manager/nix-on-droid.nix
@@ -28,7 +28,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 
   # Set up nix for flakes
   nix.extraOptions = ''
@@ -47,7 +47,7 @@
       { config, lib, pkgs, ... }:
       {
         # Read the changelog before changing this value
-        home.stateVersion = "23.05";
+        home.stateVersion = "23.11";
 
         # insert home-manager config
       };
diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix
index cb6444b..422e490 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.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-23.05";
+      url = "github:nix-community/nix-on-droid/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/templates/minimal/nix-on-droid.nix b/templates/minimal/nix-on-droid.nix
index b98b190..c1bcd1f 100644
--- a/templates/minimal/nix-on-droid.nix
+++ b/templates/minimal/nix-on-droid.nix
@@ -28,7 +28,7 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 
   # Set up nix for flakes
   nix.extraOptions = ''
diff --git a/tests/fakedroid.sh b/tests/fakedroid.sh
index f509034..c85c328 100644
--- a/tests/fakedroid.sh
+++ b/tests/fakedroid.sh
@@ -59,7 +59,6 @@ PROOT_ARGS=(
     "-b" "/dev"
     "-b" "/proc"
     "-b" "/sys"
-    "--link2symlink"
 )
 
 
diff --git a/tests/on-device/config-flake-default.nix b/tests/on-device/config-flake-default.nix
index 326725f..52d9f82 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.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
     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 6f01150..dfc9c4f 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.05";
+  system.stateVersion = "23.11";
 
   # no nixpkgs.overlays defined
   environment.packages = with pkgs; [ zsh ];
@@ -9,7 +9,7 @@
   home-manager.config =
     { pkgs, ... }:
     {
-      home.stateVersion = "23.05";
+      home.stateVersion = "23.11";
 
       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 8af3a1d..c8cbce4 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.05";
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     nix-on-droid.url = "<<FLAKE_URL>>";
     nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
     nix-on-droid.inputs.home-manager.follows = "home-manager";
diff --git a/tests/on-device/config-flake-hosts-localhost.cfg.nix b/tests/on-device/config-flake-hosts-localhost.cfg.nix
index f32e6e8..157308a 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.05";
+  system.stateVersion = "23.11";
 
   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 b2f3ad0..a633fa3 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.05";
+  system.stateVersion = "23.11";
 
   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 9be93e2..31bf1f5 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.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
     nix-on-droid.url = "<<FLAKE_URL>>";
     nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
   };
diff --git a/tests/on-device/config-h-m.bats b/tests/on-device/config-h-m.bats
index dbc8750..1ffc00e 100644
--- a/tests/on-device/config-h-m.bats
+++ b/tests/on-device/config-h-m.bats
@@ -21,7 +21,7 @@ teardown() {
   [[ ! -e ~/.config/example ]]
 
   # set up / build / activate the configuration
-  nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+  nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
   nix-channel --update
   cp "$ON_DEVICE_TESTS_DIR/config-h-m.nix" ~/.config/nixpkgs/nix-on-droid.nix
   nix-on-droid switch
diff --git a/tests/on-device/config-h-m.nix b/tests/on-device/config-h-m.nix
index 9f23a3e..be8bd39 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.05";
+  system.stateVersion = "23.11";
 
   home-manager.config =
     { pkgs, lib, ... }:
     {
-      home.stateVersion = "23.05";
+      home.stateVersion = "23.11";
       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 ee26676..ec3d8f4 100644
--- a/tests/on-device/config-term-colors.nix
+++ b/tests/on-device/config-term-colors.nix
@@ -1,7 +1,7 @@
 _:
 
 {
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
   terminal.colors = {
     background = "#FFFFFF";
     foreground = "#000000";