diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index b589dc8b84..a84a5ce168 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -38,7 +38,7 @@ jobs:
       build_type: pull-request
       node_type: "cpu8"
       arch: "amd64"
-      container_image: "rapidsai/ci:latest"
+      container_image: "rapidsai/ci:cuda11.8.0-ubuntu22.04-py3.10"
       run_script: "ci/run_clang_tidy.sh"
   conda-cpp-build:
     needs: checks
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
index 0feb1bf80b..bc6b2f23b4 100755
--- a/ci/build_cpp.sh
+++ b/ci/build_cpp.sh
@@ -11,6 +11,6 @@ rapids-print-env
 
 rapids-logger "Begin cpp build"
 
-rapids-mamba-retry mambabuild conda/recipes/libcuml
+rapids-conda-retry mambabuild conda/recipes/libcuml
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
index 2eca4a33ef..79b8813c4a 100755
--- a/ci/build_python.sh
+++ b/ci/build_python.sh
@@ -15,7 +15,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
-rapids-mamba-retry mambabuild \
+rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/cuml
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index c5a02cd670..0ad691fdbf 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -622,7 +622,7 @@ if(BUILD_CUML_CPP_LIBRARY)
   # because cumlprims_mg and cuML inherit their CUDA libs from the raft::raft
   # INTERFACE target.
   list(APPEND ${_cuml_cpp_libs_var_name}
-    $<$<BOOL:${CUML_RAFT_COMPILED}>:raft::compiled>
+    $<$<BOOL:${CUML_RAFT_COMPILED}>:${RAFT_COMPILED_LIB}>
     $<TARGET_NAME_IF_EXISTS:cumlprims_mg::cumlprims_mg>
   )
 
diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
index b335b075b2..8919feb45d 100644
--- a/cpp/cmake/thirdparty/get_raft.cmake
+++ b/cpp/cmake/thirdparty/get_raft.cmake
@@ -36,17 +36,14 @@ function(find_and_configure_raft)
         string(APPEND RAFT_COMPONENTS " distributed")
     endif()
 
-
     if(PKG_COMPILE_LIBRARY)
-      string(APPEND RAFT_COMPONENTS " compiled")
-      set(RAFT_COMPILE_LIBRARY ON)
-    else()
-      set(RAFT_COMPILE_LIBRARY OFF)
-    endif()
-
-    set(RAFT_BUILD_SHARED_LIBS ON)
-    if(${PKG_USE_RAFT_STATIC})
-        set(RAFT_BUILD_SHARED_LIBS OFF)
+      if(NOT PKG_USE_RAFT_STATIC)
+        string(APPEND RAFT_COMPONENTS " compiled")
+        set(RAFT_COMPILED_LIB raft::compiled PARENT_SCOPE)
+      else()
+        string(APPEND RAFT_COMPONENTS " compiled_static")
+        set(RAFT_COMPILED_LIB raft::compiled_static PARENT_SCOPE)
+      endif()
     endif()
 
     # We need to set this each time so that on subsequent calls to cmake
@@ -68,7 +65,6 @@ function(find_and_configure_raft)
         OPTIONS
           "BUILD_TESTS OFF"
           "BUILD_BENCH OFF"
-          "BUILD_SHARED_LIBS ${RAFT_BUILD_SHARED_LIBS}"
           "RAFT_COMPILE_LIBRARY ${PKG_COMPILE_LIBRARY}"
     )
 
diff --git a/python/cuml/dask/common/part_utils.py b/python/cuml/dask/common/part_utils.py
index 39466bf075..a6aa892a76 100644
--- a/python/cuml/dask/common/part_utils.py
+++ b/python/cuml/dask/common/part_utils.py
@@ -160,7 +160,7 @@ def _extract_partitions(dask_obj, client=None):
 
     yield wait(parts)
 
-    key_to_part = [(str(part.key), part) for part in parts]
+    key_to_part = [(part.key, part) for part in parts]
     who_has = yield client.who_has(parts)
 
     raise gen.Return(
diff --git a/python/cuml/tests/test_metrics.py b/python/cuml/tests/test_metrics.py
index 5e8d8bb7c4..d38bf774f5 100644
--- a/python/cuml/tests/test_metrics.py
+++ b/python/cuml/tests/test_metrics.py
@@ -1030,8 +1030,7 @@ def test_pairwise_distances(metric: str, matrix_size, is_col_major):
     # Test the pairwise_distance helper function.
     rng = np.random.RandomState(0)
 
-    # For fp64, compare at 13 decimals, (2 places less than the ~15 max)
-    compare_precision = 6
+    compare_precision = 2 if metric == "nan_euclidean" else 4
 
     # Compare to sklearn, single input
     X = prep_dense_array(