diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b237a67888..f5fe2c9d4c 100755
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,19 +5,20 @@ cpp/               @rapidsai/kvikio-cpp-codeowners
 python/            @rapidsai/kvikio-python-codeowners
 
 #cmake code owners
-**/CMakeLists.txt  @rapidsai/kvikio-cmake-codeowners
+CMakeLists.txt     @rapidsai/kvikio-cmake-codeowners
 **/cmake/          @rapidsai/kvikio-cmake-codeowners
+*.cmake            @rapidsai/kvikio-cmake-codeowners
 build.sh           @rapidsai/kvikio-cmake-codeowners
 python/setup.py    @rapidsai/kvikio-cmake-codeowners @rapidsai/kvikio-python-codeowners
 
 #CI code owners
 /.github/                @rapidsai/ci-codeowners
 /ci/                     @rapidsai/ci-codeowners
-/.pre-commit-config.yaml @rapidsai/ci-codeowners
 
 #packaging code owners
-/.devcontainer/    @rapidsai/packaging-codeowners
-/conda/            @rapidsai/packaging-codeowners
-/dependencies.yaml @rapidsai/packaging-codeowners
-/build.sh          @rapidsai/packaging-codeowners
-pyproject.toml     @rapidsai/packaging-codeowners
+/.pre-commit-config.yaml @rapidsai/packaging-codeowners
+/.devcontainer/          @rapidsai/packaging-codeowners
+/conda/                  @rapidsai/packaging-codeowners
+dependencies.yaml        @rapidsai/packaging-codeowners
+/build.sh                @rapidsai/packaging-codeowners
+pyproject.toml           @rapidsai/packaging-codeowners
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 50f26c7bc0..bb9e085142 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024, NVIDIA CORPORATION.
+# Copyright (c) 2019-2025, NVIDIA CORPORATION.
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -90,12 +90,13 @@ repos:
             ^CHANGELOG.md$
           )
   - repo: https://github.com/rapidsai/pre-commit-hooks
-    rev: v0.4.0
+    rev: v0.6.0
     hooks:
       - id: verify-copyright
         files: |
           (?x)
               [.](cmake|cpp|cu|cuh|h|hpp|sh|pxd|py|pyx)$|
+              ^[.]pre-commit-config[.]yaml$|
               CMakeLists[.]txt$|
               meta[.]yaml$
         exclude: |
@@ -103,6 +104,8 @@ repos:
             cpp/cmake/Modules/FindCUDAToolkit[.]cmake$
           )
       - id: verify-alpha-spec
+      - id: verify-codeowners
+        args: [--fix, --project-prefix=kvikio]
   - repo: https://github.com/rapidsai/dependency-file-generator
     rev: v1.17.0
     hooks: