diff --git a/INSTALL.md b/INSTALL.md
index 1181e2d570..8624da6e01 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -42,7 +42,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
   - Boost.Range: header-only, *only used for unit testing*
 - [BTAS](http://github.com/ValeevGroup/BTAS), tag bf0c376d5cdd6f668174b2a4c67b19634d1c0da7 . If usable BTAS installation is not found, TiledArray will download and compile
   BTAS from source. *This is the recommended way to compile BTAS for all users*.
-- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 03c82cf2780d9e96298cc9140ac128c73eacd3b1 .
+- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag c0c4ea543439c740e3ee848fdd055c633a47f6c5 .
   Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
   If usable MADNESS installation is not found, TiledArray will download and compile
   MADNESS from source. *This is the recommended way to compile MADNESS for all users*.
diff --git a/external/versions.cmake b/external/versions.cmake
index b5c6309e6f..eff687a3fe 100644
--- a/external/versions.cmake
+++ b/external/versions.cmake
@@ -19,8 +19,8 @@ set(TA_INSTALL_EIGEN_PREVIOUS_VERSION 3.3.7)
 set(TA_INSTALL_EIGEN_URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626)
 set(TA_INSTALL_EIGEN_PREVIOUS_URL_HASH MD5=b9e98a200d2455f06db9c661c5610496)
 
-set(TA_TRACKED_MADNESS_TAG 03c82cf2780d9e96298cc9140ac128c73eacd3b1)
-set(TA_TRACKED_MADNESS_PREVIOUS_TAG 4f7d30b0a738621037b96bb5b820029835753667)
+set(TA_TRACKED_MADNESS_TAG c0c4ea543439c740e3ee848fdd055c633a47f6c5)
+set(TA_TRACKED_MADNESS_PREVIOUS_TAG 03c82cf2780d9e96298cc9140ac128c73eacd3b1)
 set(TA_TRACKED_MADNESS_VERSION 0.10.1)
 set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)
 
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 690b35979d..99e29e2a83 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,14 +1,18 @@
 cmake_minimum_required(VERSION 3.12)
 
+project(python-tiledarray)
+
+if (NOT TARGET Python::Module)
+  find_package(Python COMPONENTS Interpreter Development REQUIRED)
+endif()
+
 FetchContent_Declare(
   pybind11
   GIT_REPOSITORY      https://github.com/ValeevGroup/pybind11.git
-  GIT_TAG             80d452484c5409444b0ec19383faa84bb7a4d351 # v2.4.3
+  GIT_TAG             ValeevGroup/v2.11
   )
 FetchContent_MakeAvailable(pybind11)
 
-project(python-tiledarray)
-
 set(CMAKE_CXX_STANDARD 17)
 add_compile_options(-Wall)
 
@@ -39,11 +43,11 @@ if (BUILD_TESTING)
 
   # check for presence of prerequisite modules
   foreach(_mod pytest numpy)
-    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import ${_mod}"
+    execute_process(COMMAND ${Python_EXECUTABLE} -c "import ${_mod}"
         OUTPUT_QUIET ERROR_QUIET
         RESULTS_VARIABLE check_for_${_mod})
     if (check_for_${_mod})
-      message(FATAL_ERROR "Python module \"${_mod}\" is not installed; install via \"${PYTHON_EXECUTABLE} -m pip install ${_mod}\" and rerun cmake")
+      message(FATAL_ERROR "Python module \"${_mod}\" is not installed; install via \"${Python_EXECUTABLE} -m pip install ${_mod}\" and rerun cmake")
     endif(check_for_${_mod})
   endforeach(_mod)
 
@@ -51,7 +55,7 @@ if (BUILD_TESTING)
   add_test(
     NAME tiledarray/unit/python/run
     # need to use pytest to find tiledarray module properly
-    COMMAND ${PYTHON_EXECUTABLE} -m pytest ${PROJECT_SOURCE_DIR}/test_tiledarray.py -v
+    COMMAND ${Python_EXECUTABLE} -m pytest ${PROJECT_SOURCE_DIR}/test_tiledarray.py -v
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
   set_tests_properties(tiledarray/unit/python/run