diff --git a/CMakeLists.txt b/CMakeLists.txt
index 152429eb49..387e65c74e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -585,12 +585,17 @@ elseif(CP2K_USE_ACCEL MATCHES "HIP")
 elseif(CP2K_USE_ACCEL MATCHES "OPENCL")
   find_package(OpenCL REQUIRED)
 
-  set(CP2K_OPENCL_TOOLDIR ${CMAKE_CURRENT_SOURCE_DIR}/exts/dbcsr/src/acc/opencl)
-  set(CP2K_OPENCL_SCRIPT ${CP2K_OPENCL_TOOLDIR}/acc_opencl.sh)
+  # common header files used by OpenCL kernels
+  set(CP2K_OPENCL_COMMON opencl_atomics.h opencl_common.h)
 
-  if(EXISTS ${CP2K_OPENCL_SCRIPT})
-    # common header files used by OpenCL kernels
-    set(CP2K_OPENCL_COMMON common/opencl_atomics.h common/opencl_common.h)
+  set(CP2K_OPENCL_TOOLDIR ${DBCSR_DIR}/share/opencl)
+  if(NOT EXISTS ${CP2K_OPENCL_TOOLDIR}/acc_opencl.sh)
+    set(CP2K_OPENCL_TOOLDIR
+        ${CMAKE_CURRENT_SOURCE_DIR}/exts/dbcsr/src/acc/opencl)
+    list(TRANSFORM CP2K_OPENCL_COMMON PREPEND common/)
+  endif()
+
+  if(EXISTS ${CP2K_OPENCL_TOOLDIR}/acc_opencl.sh)
     list(TRANSFORM CP2K_OPENCL_COMMON PREPEND ${CP2K_OPENCL_TOOLDIR}/)
     set(CP2K_USE_OPENCL ON)
   else()
@@ -847,7 +852,7 @@ message(
   "-                                                                  -\n"
   "-               Summary of enabled dependencies                    -\n"
   "-                                                                  -\n"
-  "--------------------------------------------------------------------\n\n")
+  "--------------------------------------------------------------------\n")
 
 message(
   "  - BLAS\n" # keep line break
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c8282c353..d0ea6c9c1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1509,10 +1509,10 @@ if(CP2K_USE_CUDA
       add_custom_target(
         CP2K_DBM_OPENCL_TARGET ALL
         COMMAND
-          ${CP2K_OPENCL_SCRIPT} -b 6 -p \"\"
+          ${CP2K_OPENCL_TOOLDIR}/acc_opencl.sh -b 6 -p \"\"
           ${CMAKE_CURRENT_SOURCE_DIR}/${CP2K_DBM_SRCS_OPENCL}
           ${CMAKE_CURRENT_SOURCE_DIR}/${CP2K_DBM_SRCS_OPENCL}.h
-        DEPENDS ${CP2K_OPENCL_SCRIPT} ${CP2K_OPENCL_COMMON}
+        DEPENDS ${CP2K_OPENCL_TOOLDIR}/acc_opencl.sh ${CP2K_OPENCL_COMMON}
                 ${CMAKE_CURRENT_SOURCE_DIR}/${CP2K_DBM_SRCS_OPENCL}
         BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/${CP2K_DBM_SRCS_OPENCL}.h)
     endif()