diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d1c7e77..e706078d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.50)
 project(kompute VERSION 0.9.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -234,7 +234,7 @@ if(KOMPUTE_OPT_BUILD_PYTHON)
         find_package(pybind11 REQUIRED)
     endif()
 
-    find_package(PythonLibs REQUIRED)
+    find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
 endif()
 
 # ####################################################
diff --git a/setup.py b/setup.py
index 8331f6af..676f2940 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,9 @@ def build_extension(self, ext):
                       '-DKOMPUTE_OPT_BUILD_PYTHON=ON',
                       '-DKOMPUTE_OPT_LOG_LEVEL=Off',
                       '-DKOMPUTE_OPT_USE_SPDLOG=Off',
-                      '-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON'
-                      '-DPYTHON_EXECUTABLE=' + sys.executable,
-                      '-DPYTHON_INCLUDE_DIR=' + sysconfig.get_path('include'),
-                      '-DPYTHON_LIBRARY=' + sysconfig.get_path('stdlib'),
+                      '-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON',
+                      '-DPython3_EXECUTABLE=' + sys.executable,
+                      '-DPython3_INCLUDE_DIR=' + sysconfig.get_path('include'),
         ]
 
         cfg = 'Debug' if self.debug else 'Release'
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8805e842..c0a3772e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,9 +87,7 @@ if(KOMPUTE_OPT_LOG_LEVEL_DISABLED)
 endif()
 
 if(KOMPUTE_OPT_BUILD_PYTHON)
-    include_directories(${PYTHON_INCLUDE_DIRS})
-
-    target_link_libraries(kompute PRIVATE pybind11::headers ${PYTHON_LIBRARIES})
+    target_link_libraries(kompute PRIVATE pybind11::headers Python3::Python)
 endif()
 
 if(NOT KOMPUTE_OPT_ANDROID_BUILD AND KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER)