diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 91361d3d99..a684459392 100755
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,49 +1,49 @@
 #c code owners
-c/                 @rapidsai/cuvs-c-codeowners
-examples/c/        @rapidsai/cuvs-c-codeowners
+c/                 @NVIDIA/cuvs-c-codeowners
+examples/c/        @NVIDIA/cuvs-c-codeowners
 
 #cpp code owners
-cpp/               @rapidsai/cuvs-cpp-codeowners
-examples/cpp/      @rapidsai/cuvs-cpp-codeowners
+cpp/               @NVIDIA/cuvs-cpp-codeowners
+examples/cpp/      @NVIDIA/cuvs-cpp-codeowners
 
 
 #java code owners
-java/              @rapidsai/cuvs-java-codeowners
-examples/java/     @rapidsai/cuvs-java-codeowners
+java/              @NVIDIA/cuvs-java-codeowners
+examples/java/     @NVIDIA/cuvs-java-codeowners
 
 #python code owners
-python/            @rapidsai/cuvs-python-codeowners
+python/            @NVIDIA/cuvs-python-codeowners
 
 #rust code owners
-rust/              @rapidsai/cuvs-rust-codeowners
-examples/rust/     @rapidsai/cuvs-rust-codeowners
+rust/              @NVIDIA/cuvs-rust-codeowners
+examples/rust/     @NVIDIA/cuvs-rust-codeowners
 
 #docs code owners
-docs/              @rapidsai/cuvs-docs-codeowners
-fern/              @rapidsai/cuvs-docs-codeowners
+docs/              @NVIDIA/cuvs-docs-codeowners
+fern/              @NVIDIA/cuvs-docs-codeowners
 
 #cmake code owners
-CMakeLists.txt                  @rapidsai/cuvs-cmake-codeowners
-**/cmake/                       @rapidsai/cuvs-cmake-codeowners
-*.cmake                         @rapidsai/cuvs-cmake-codeowners
-cpp/scripts/run-cmake-format.sh @rapidsai/cuvs-cmake-codeowners
+CMakeLists.txt                  @NVIDIA/cuvs-cmake-codeowners
+**/cmake/                       @NVIDIA/cuvs-cmake-codeowners
+*.cmake                         @NVIDIA/cuvs-cmake-codeowners
+cpp/scripts/run-cmake-format.sh @NVIDIA/cuvs-cmake-codeowners
 
 #CI code owners
-/.github/                @rapidsai/ci-codeowners
-/ci/                     @rapidsai/ci-codeowners
-/.shellcheckrc           @rapidsai/ci-codeowners
-/.coderabbit.yaml        @rapidsai/ci-codeowners
+/.github/                @NVIDIA/adi-ci-codeowners
+/ci/                     @NVIDIA/adi-ci-codeowners
+/.shellcheckrc           @NVIDIA/adi-ci-codeowners
+/.coderabbit.yaml        @NVIDIA/adi-ci-codeowners
 
 #packaging code owners
-/.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
-python/setup.py          @rapidsai/packaging-codeowners
-build.sh                 @rapidsai/packaging-codeowners
-**/build.sh              @rapidsai/packaging-codeowners
+/.pre-commit-config.yaml @NVIDIA/adi-packaging-codeowners
+/.devcontainer/          @NVIDIA/adi-packaging-codeowners
+/conda/                  @NVIDIA/adi-packaging-codeowners
+dependencies.yaml        @NVIDIA/adi-packaging-codeowners
+/build.sh                @NVIDIA/adi-packaging-codeowners
+pyproject.toml           @NVIDIA/adi-packaging-codeowners
+python/setup.py          @NVIDIA/adi-packaging-codeowners
+build.sh                 @NVIDIA/adi-packaging-codeowners
+**/build.sh              @NVIDIA/adi-packaging-codeowners
 
 # Ops code owners
-/SECURITY.md             @rapidsai/ops-codeowners
+/SECURITY.md             @NVIDIA/adi-ops-codeowners
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d4f8114c71..5a96462c9d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -180,8 +180,9 @@ repos:
                 cpp/src/neighbors/detail/faiss_distance_utils[.]h$
               )
           - id: verify-alpha-spec
-          - id: verify-codeowners
-            args: [--fix, --project-prefix=cuvs]
+          # TODO: Re-enable once org is configurable
+          # - id: verify-codeowners
+          #   args: [--fix, --project-prefix=cuvs]
           - id: verify-pyproject-license
             # ignore the top-level pyproject.toml, which doesn't
             # have or need a [project] table