diff --git a/.gitmodules b/.gitmodules
index 558e83a986..e3a9af6c1d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -60,4 +60,4 @@
 	url = https://github.com/eclipse-ecal/ecaludp.git
 [submodule "thirdparty/nanobind/nanobind"]
 	path = thirdparty/nanobind/nanobind
-	url = https://github.com/wjakob/nanobind.git
\ No newline at end of file
+	url = https://github.com/KerstinKeller/nanobind.git
diff --git a/CMakePresets.json b/CMakePresets.json
index fcf0472f7d..50d83f4edc 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -69,6 +69,8 @@
       "cacheVariables": {
         "HAS_HDF5": "ON",
         "BUILD_PY_BINDING": "ON",
+        "BUILD_APPS": "OFF",
+        "BUILD_SAMPLES": "OFF",
         "BUILD_SHARED": "OFF",
         "ECAL_THIRDPARTY_BUILD_HDF5": "ON"
       }
diff --git a/thirdparty/nanobind/build-nanobind.cmake b/thirdparty/nanobind/build-nanobind.cmake
index 1ed7ec86bf..692f9f48bf 100644
--- a/thirdparty/nanobind/build-nanobind.cmake
+++ b/thirdparty/nanobind/build-nanobind.cmake
@@ -1,7 +1,9 @@
+include_guard(GLOBAL)
+
 message(STATUS "building nanobind")
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.25.0")
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/nanobind EXCLUDE_FROM_ALL SYSTEM)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/nanobind thirdparty/nanobind EXCLUDE_FROM_ALL SYSTEM)
 else ()
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/nanobind EXCLUDE_FROM_ALL)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/nanobind thirdparty/nanobind EXCLUDE_FROM_ALL)
 endif ()
\ No newline at end of file
diff --git a/thirdparty/nanobind/nanobind b/thirdparty/nanobind/nanobind
index df8996aafe..97a5673bee 160000
--- a/thirdparty/nanobind/nanobind
+++ b/thirdparty/nanobind/nanobind
@@ -1 +1 @@
-Subproject commit df8996aafed8d891cbf1ac21bb828afc3f900ae1
+Subproject commit 97a5673beeda40e8b2e6e8854daed73f65ded491