diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..2e0fd7602
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*               @RadxaYuntian
diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile
index 4d1955e66..6b91f0e89 100644
--- a/.github/container/Dockerfile
+++ b/.github/container/Dockerfile
@@ -1,9 +1,10 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 RUN dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get full-upgrade --no-install-recommends -y \
         build-essential crossbuild-essential-arm64 default-jdk-headless git \
-        cmake debhelper devscripts lintian swig pkgconf:arm64 python3-dev:arm64 libjson-c-dev:arm64 && \
+        cmake debhelper devscripts lintian swig pkgconf:arm64 python3-dev:arm64 \
+        libjson-c-dev:arm64 libstdc++6:arm64 && \
     adduser --gecos runner --disabled-password runner && \
     rm -rf /var/lib/apt/lists/*
diff --git a/cmake/modules/OpenCVDetectPython.cmake b/cmake/modules/OpenCVDetectPython.cmake
index c0441c458..5f3db2d89 100644
--- a/cmake/modules/OpenCVDetectPython.cmake
+++ b/cmake/modules/OpenCVDetectPython.cmake
@@ -29,29 +29,55 @@ function(find_python preferred_version min_version library_env include_dir_env
 if(NOT ${found})
   if(${executable})
     set(PYTHON_EXECUTABLE "${${executable}}")
+    set(Python_EXECUTABLE "${${executable}}")
   endif()
 
-  find_package(PythonInterp "${preferred_version}")
-  if(NOT PYTHONINTERP_FOUND)
-    find_package(PythonInterp "${min_version}")
-  endif()
+  if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
+    find_package(Python "${preferred_version}" COMPONENTS Interpreter)
+    if(NOT Python_Interpreter_FOUND)
+      find_package(Python "${min_version}" COMPONENTS Interpreter)
+    endif()
 
-  if(PYTHONINTERP_FOUND)
-    # Copy outputs
-    set(_found ${PYTHONINTERP_FOUND})
-    set(_executable ${PYTHON_EXECUTABLE})
-    set(_version_string ${PYTHON_VERSION_STRING})
-    set(_version_major ${PYTHON_VERSION_MAJOR})
-    set(_version_minor ${PYTHON_VERSION_MINOR})
-    set(_version_patch ${PYTHON_VERSION_PATCH})
+    if(Python_Interpreter_FOUND)
+      # Copy outputs
+      set(_found ${Python_Interpreter_FOUND})
+      set(_executable ${Python_EXECUTABLE})
+      set(_version_string ${Python_VERSION})
+      set(_version_major ${Python_VERSION_MAJOR})
+      set(_version_minor ${Python_VERSION_MINOR})
+      set(_version_patch ${Python_VERSION_PATCH})
 
-    # Clear find_host_package side effects
-    unset(PYTHONINTERP_FOUND)
-    unset(PYTHON_EXECUTABLE CACHE)
-    unset(PYTHON_VERSION_STRING)
-    unset(PYTHON_VERSION_MAJOR)
-    unset(PYTHON_VERSION_MINOR)
-    unset(PYTHON_VERSION_PATCH)
+      # Clear find_host_package side effects
+      unset(Python_Interpreter_FOUND)
+      unset(Python_EXECUTABLE CACHE)
+      unset(Python_VERSION)
+      unset(Python_VERSION_MAJOR)
+      unset(Python_VERSION_MINOR)
+      unset(Python_VERSION_PATCH)
+    endif()
+  else()
+    find_package(PythonInterp "${preferred_version}")
+    if(NOT PYTHONINTERP_FOUND)
+      find_package(PythonInterp "${min_version}")
+    endif()
+
+    if(PYTHONINTERP_FOUND)
+      # Copy outputs
+      set(_found ${PYTHONINTERP_FOUND})
+      set(_executable ${PYTHON_EXECUTABLE})
+      set(_version_string ${PYTHON_VERSION_STRING})
+      set(_version_major ${PYTHON_VERSION_MAJOR})
+      set(_version_minor ${PYTHON_VERSION_MINOR})
+      set(_version_patch ${PYTHON_VERSION_PATCH})
+
+      # Clear find_host_package side effects
+      unset(PYTHONINTERP_FOUND)
+      unset(PYTHON_EXECUTABLE CACHE)
+      unset(PYTHON_VERSION_STRING)
+      unset(PYTHON_VERSION_MAJOR)
+      unset(PYTHON_VERSION_MINOR)
+      unset(PYTHON_VERSION_PATCH)
+    endif()
   endif()
 
   if(_found)
diff --git a/debian/python3-mraa.install b/debian/python3-mraa.install
index 8d1b877d1..37ed7ce5d 100644
--- a/debian/python3-mraa.install
+++ b/debian/python3-mraa.install
@@ -1 +1 @@
-usr/lib/python3.9/dist-packages/* usr/lib/python3/dist-packages/
+usr/lib/python3*/dist-packages/* usr/lib/python3/dist-packages/