diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e48f2e11ac..bdfcd58763 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -174,6 +174,9 @@ jobs:
     with:
       build_type: pull-request
       script: ci/test_wheel_pylibcugraph.sh
+      # CUDA 11 wheel CI is disabled until
+      # https://github.com/rapidsai/build-planning/issues/137 is resolved.
+      matrix_filter: map(select(.CUDA_VER | startswith("11") | not))
   wheel-build-cugraph:
     needs: wheel-build-pylibcugraph
     secrets: inherit
@@ -189,6 +192,9 @@ jobs:
     with:
       build_type: pull-request
       script: ci/test_wheel_cugraph.sh
+      # CUDA 11 wheel CI is disabled until
+      # https://github.com/rapidsai/build-planning/issues/137 is resolved.
+      matrix_filter: map(select(.CUDA_VER | startswith("11") | not))
   devcontainer:
     secrets: inherit
     needs: telemetry-setup
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4aa698c987..f9c3fb9537 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -49,6 +49,9 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       script: ci/test_wheel_pylibcugraph.sh
+      # CUDA 11 wheel CI is disabled until
+      # https://github.com/rapidsai/build-planning/issues/137 is resolved.
+      matrix_filter: map(select(.CUDA_VER | startswith("11") | not))
   wheel-tests-cugraph:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02
@@ -58,3 +61,6 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       script: ci/test_wheel_cugraph.sh
+      # CUDA 11 wheel CI is disabled until
+      # https://github.com/rapidsai/build-planning/issues/137 is resolved.
+      matrix_filter: map(select(.CUDA_VER | startswith("11") | not))
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 40a9f85bbc..6766eaaa24 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -40,12 +40,12 @@ EXCLUDE_ARGS=(
 # 'libraft' wheels are responsible for carrying a runtime dependency on
 # these based on RAFT's needs.
 EXCLUDE_ARGS+=(
-  --exclude "libcublas.so.12"
-  --exclude "libcublasLt.so.12"
-  --exclude "libcurand.so.10"
-  --exclude "libcusolver.so.11"
-  --exclude "libcusparse.so.12"
-  --exclude "libnvJitLink.so.12"
+  --exclude "libcublas.so.*"
+  --exclude "libcublasLt.so.*"
+  --exclude "libcurand.so.*"
+  --exclude "libcusolver.so.*"
+  --exclude "libcusparse.so.*"
+  --exclude "libnvJitLink.so.*"
 )
 
 if [[ "${package_dir}" != "python/libcugraph" ]]; then
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index edfb9ad490..f7f64a45b2 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -35,7 +35,7 @@ dependencies:
 - networkx>=2.5.1
 - ninja
 - notebook>=0.5.0
-- numba>=0.57
+- numba>=0.59.1,<0.61.0a0
 - numpy>=1.23,<3.0a0
 - numpydoc
 - nvcc_linux-64=11.8
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index 67cf6ce8b9..14e53a5c66 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -41,7 +41,7 @@ dependencies:
 - networkx>=2.5.1
 - ninja
 - notebook>=0.5.0
-- numba>=0.57
+- numba>=0.59.1,<0.61.0a0
 - numpy>=1.23,<3.0a0
 - numpydoc
 - ogb
diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml
index 7df7573e2d..2af3242395 100644
--- a/conda/recipes/cugraph-service/meta.yaml
+++ b/conda/recipes/cugraph-service/meta.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2024, NVIDIA CORPORATION.
+# Copyright (c) 2018-2025, NVIDIA CORPORATION.
 
 {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -62,7 +62,7 @@ outputs:
         - cupy >=12.0.0
         - dask-cuda ={{ minor_version }}
         - dask-cudf ={{ minor_version }}
-        - numba >=0.57
+        - numba >=0.59.1,<0.61.0a0
         - numpy >=1.23,<3.0a0
         - python
         - rapids-dask-dependency ={{ minor_version }}
diff --git a/cpp/include/cugraph/detail/collect_comm_wrapper.hpp b/cpp/include/cugraph/detail/collect_comm_wrapper.hpp
index f2307705ac..7d65991c2a 100644
--- a/cpp/include/cugraph/detail/collect_comm_wrapper.hpp
+++ b/cpp/include/cugraph/detail/collect_comm_wrapper.hpp
@@ -28,11 +28,8 @@ namespace detail {
 /** @defgroup collect_comm_wrapper_cpp C++ Shuffle Wrappers
  */
 
-/** @ingroup collect_comm_wrapper_cpp
- *  @{
- */
-
 /**
+ * @ingroup collect_comm_wrapper_cpp
  * @brief Gather the span of data from all ranks and broadcast the combined data to all ranks.
  *
  * @param[in] handle RAFT handle object to encapsulate resources (e.g. CUDA stream, communicator,
diff --git a/cpp/include/cugraph/detail/shuffle_wrappers.hpp b/cpp/include/cugraph/detail/shuffle_wrappers.hpp
index 33ae38b811..8c513705f7 100644
--- a/cpp/include/cugraph/detail/shuffle_wrappers.hpp
+++ b/cpp/include/cugraph/detail/shuffle_wrappers.hpp
@@ -28,11 +28,8 @@ namespace detail {
 /** @defgroup shuffle_wrappers_cpp C++ Shuffle Wrappers
  */
 
-/** @ingroup shuffle_wrappers_cpp
- *  @{
- */
-
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle external (i.e. before renumbering) vertex pairs (which can be edge end points) to
  * their local GPUs based on edge partitioning.
  *
@@ -82,6 +79,7 @@ shuffle_ext_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
   std::optional<rmm::device_uvector<edge_time_t>>&& edge_end_times);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle internal (i.e. renumbered) vertex pairs (which can be edge end points) to their
  * local GPUs based on edge partitioning.
  *
@@ -135,6 +133,7 @@ shuffle_int_vertex_pairs_with_values_to_local_gpu_by_edge_partitioning(
   std::vector<vertex_t> const& vertex_partition_range_lasts);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle external (i.e. before renumbering) vertices to their local GPU based on vertex
  * partitioning.
  *
@@ -151,6 +150,7 @@ rmm::device_uvector<vertex_t> shuffle_ext_vertices_to_local_gpu_by_vertex_partit
   raft::handle_t const& handle, rmm::device_uvector<vertex_t>&& vertices);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle external (i.e. before renumbering) vertex & value pairs to their local GPU based
  * on vertex partitioning.
  *
@@ -172,6 +172,7 @@ shuffle_ext_vertex_value_pairs_to_local_gpu_by_vertex_partitioning(
   rmm::device_uvector<value_t>&& values);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Permute a range.
  *
  * @tparam vertex_t Type of vertex identifiers. Needs to be an integral type.
@@ -194,6 +195,7 @@ rmm::device_uvector<vertex_t> permute_range(raft::handle_t const& handle,
                                             bool do_expensive_check = false);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle internal (i.e. renumbered) vertices to their local GPUs based on vertex
  * partitioning.
  *
@@ -214,6 +216,7 @@ rmm::device_uvector<vertex_t> shuffle_int_vertices_to_local_gpu_by_vertex_partit
   std::vector<vertex_t> const& vertex_partition_range_lasts);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Shuffle vertices using the internal vertex key function which returns the target GPU ID.
  *
  * @tparam vertex_t Type of vertex identifiers. Needs to be an integral type.
@@ -236,6 +239,7 @@ shuffle_int_vertex_value_pairs_to_local_gpu_by_vertex_partitioning(
   std::vector<vertex_t> const& vertex_partition_range_lasts);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Groupby and count edgelist using the key function which returns the target local partition
  * ID for an edge.
  *
@@ -282,6 +286,7 @@ rmm::device_uvector<size_t> groupby_and_count_edgelist_by_local_partition_id(
   bool groupby_and_count_local_partition_by_minor = false);
 
 /**
+ * @ingroup shuffle_wrappers_cpp
  * @brief Collect vertex values (represented as k/v pairs across cluster) and return
  *        local value arrays on the GPU responsible for each vertex.
  *
@@ -317,7 +322,3 @@ rmm::device_uvector<value_t> collect_local_vertex_values_from_ext_vertex_value_p
 
 }  // namespace detail
 }  // namespace cugraph
-
-/**
- * @}
- */
diff --git a/cpp/include/cugraph/detail/utility_wrappers.hpp b/cpp/include/cugraph/detail/utility_wrappers.hpp
index b1afeafd66..292ad2615c 100644
--- a/cpp/include/cugraph/detail/utility_wrappers.hpp
+++ b/cpp/include/cugraph/detail/utility_wrappers.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,11 @@
 namespace cugraph {
 namespace detail {
 
+/** @defgroup utility_wrappers_cpp C++ Utility Wrappers
+ */
+
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Fill a buffer with uniformly distributed random values
  *
  * Fills a buffer with uniformly distributed random values between
@@ -51,6 +55,7 @@ void uniform_random_fill(rmm::cuda_stream_view const& stream_view,
                          raft::random::RngState& rng_state);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Fill a buffer with a constant value
  *
  * @tparam      value_t      type of the value to operate on
@@ -66,6 +71,7 @@ template <typename value_t>
 void scalar_fill(raft::handle_t const& handle, value_t* d_value, size_t size, value_t value);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Sort a device span
  *
  * @tparam      value_t      type of the value to operate on. Must be either int32_t or int64_t.
@@ -79,6 +85,7 @@ template <typename value_t>
 void sort_ints(raft::handle_t const& handle, raft::device_span<value_t> values);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Keep unique element from a device span
  *
  * @tparam      value_t      type of the value to operate on. Must be either int32_t or int64_t.
@@ -93,6 +100,7 @@ template <typename value_t>
 size_t unique_ints(raft::handle_t const& handle, raft::device_span<value_t> values);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Increment the values of a device span by a constant value
  *
  * @tparam      value_t      type of the value to operate on. Must be either int32_t or int64_t.
@@ -108,6 +116,7 @@ void transform_increment_ints(raft::device_span<value_t> values,
                               rmm::cuda_stream_view const& stream_view);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Fill a buffer with a sequence of values
  *
  * Fills the buffer with the sequence:
@@ -130,6 +139,7 @@ void sequence_fill(rmm::cuda_stream_view const& stream_view,
                    value_t start_value);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Fill a buffer with a sequence of values with the input stride
  *
  * Fills the buffer with the sequence with the input stride:
@@ -152,6 +162,7 @@ void stride_fill(rmm::cuda_stream_view const& stream_view,
                  value_t stride);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Compute the maximum vertex id of an edge list
  *
  * max(d_edgelist_srcs.max(), d_edgelist_dsts.max())
@@ -172,6 +183,7 @@ vertex_t compute_maximum_vertex_id(rmm::cuda_stream_view const& stream_view,
                                    size_t num_edges);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief    Compute the maximum vertex id of an edge list
  *
  * max(d_edgelist_srcs.max(), d_edgelist_dsts.max())
@@ -194,6 +206,7 @@ vertex_t compute_maximum_vertex_id(rmm::cuda_stream_view const& stream_view,
 }
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief Filter zero degree vertices from this frontier
  *
  * @tparam vertex_t vertex type
@@ -211,6 +224,7 @@ std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<edge_t>> filter_de
   rmm::device_uvector<edge_t>&& d_out_degs);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief Check if device span is sorted
  *
  * @tparam data_t type of data in span
@@ -223,6 +237,7 @@ template <typename data_t>
 bool is_sorted(raft::handle_t const& handle, raft::device_span<data_t> span);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief Check if two device spans are equal.  Returns true if every element in the spans are
  * equal.
  *
@@ -239,6 +254,7 @@ bool is_equal(raft::handle_t const& handle,
               raft::device_span<data_t> span2);
 
 /**
+ * @ingroup utility_wrappers_cpp
  * @brief Count the number of times a value appears in a span
  *
  * @tparam data_t type of data in span
diff --git a/cpp/include/cugraph/graph_generators.hpp b/cpp/include/cugraph/graph_generators.hpp
index 7246f0b2fb..d1f424d979 100644
--- a/cpp/include/cugraph/graph_generators.hpp
+++ b/cpp/include/cugraph/graph_generators.hpp
@@ -27,13 +27,10 @@
 /** @defgroup graph_generators_cpp C++ Graph Generators
  */
 
-/** @ingroup graph_generators_cpp
- *  @{
- */
-
 namespace cugraph {
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for an R-mat graph.
  * @deprecated  This function will be deprectated and should be replaced with the version that takes
  * raft::random::RngState as a parameter
@@ -92,6 +89,7 @@ std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<vertex_t>> generat
   bool scramble_vertex_ids = false);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for an R-mat graph.
  *
  * This function allows multi-edges and self-loops similar to the Graph 500 reference
@@ -143,6 +141,7 @@ std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<vertex_t>> generat
   bool scramble_vertex_ids = false);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for a bipartite R-mat graph.
  *
  * The source vertex IDs will be in the range of [0, 2^src_scale) and the destination vertex IDs
@@ -184,6 +183,7 @@ generate_bipartite_rmat_edgelist(raft::handle_t const& handle,
 enum class generator_distribution_t { POWER_LAW = 0, UNIFORM };
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate multiple edge lists using the R-mat graph generator.
  * @deprecated  This function will be deprectated and should be replaced with the version that takes
  *raft::random::RngState as a parameter
@@ -236,6 +236,7 @@ generate_rmat_edgelists(
   bool scramble_vertex_ids                   = false);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate multiple edge lists using the R-mat graph generator.
  *
  * This function allows multi-edges and self-loops similar to the Graph 500 reference
@@ -286,6 +287,7 @@ generate_rmat_edgelists(
   bool scramble_vertex_ids                   = false);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for path graph
  *
  * A path graph of size n connects the vertices from 0 to (n - 1)
@@ -315,6 +317,7 @@ generate_path_graph_edgelist(
   std::vector<std::tuple<vertex_t, vertex_t>> const& component_parameters_v);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for a 2D Mesh Graph
  *
  * A sequence of 2D mesh graphs will be constructed according to the
@@ -340,6 +343,7 @@ generate_2d_mesh_graph_edgelist(
   std::vector<std::tuple<vertex_t, vertex_t, vertex_t>> const& component_parameters_v);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge list for a 3D Mesh Graph
  *
  * A sequence of 3D mesh graphs will be constructed according to the
@@ -365,6 +369,7 @@ generate_3d_mesh_graph_edgelist(
   std::vector<std::tuple<vertex_t, vertex_t, vertex_t, vertex_t>> const& component_parameters_v);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge lists for some complete graphs
  *
  * A sequence of complete graphs will be constructed according to the
@@ -390,6 +395,7 @@ generate_complete_graph_edgelist(
   std::vector<std::tuple<vertex_t, vertex_t>> const& component_parameters_v);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge lists for an Erdos-Renyi graph
  *
  * This API supports the G(n,p) model which requires O(n^2) work.
@@ -417,6 +423,7 @@ generate_erdos_renyi_graph_edgelist_gnp(raft::handle_t const& handle,
                                         uint64_t seed = 0);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief generate an edge lists for an Erdos-Renyi graph
  *
  * This API supports the G(n,m) model
@@ -444,6 +451,7 @@ generate_erdos_renyi_graph_edgelist_gnm(raft::handle_t const& handle,
                                         uint64_t seed = 0);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief symmetrize an edgelist from the edges in the lower (or upper but not both) triangular part
  * of a graph adjacency matrix
  *
@@ -471,6 +479,7 @@ symmetrize_edgelist_from_triangular(
   bool check_diagonal = false);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief scramble vertex IDs in a graph
  *
  * Given a vertex list for a graph, scramble the input vertex IDs.
@@ -491,6 +500,7 @@ rmm::device_uvector<vertex_t> scramble_vertex_ids(raft::handle_t const& handle,
                                                   size_t lgN);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief scramble vertex ids in a graph
  *
  * Given an edge list for a graph, scramble the input vertex IDs.
@@ -515,6 +525,7 @@ std::tuple<rmm::device_uvector<vertex_t>, rmm::device_uvector<vertex_t>> scrambl
   size_t lgN);
 
 /**
+ * @ingroup graph_generators_cpp
  * @brief Combine edgelists from multiple sources into a single edgelist
  *
  * If executed in a multi-gpu context (handle comms has been initialized)
@@ -543,7 +554,3 @@ combine_edgelists(raft::handle_t const& handle,
                   bool remove_multi_edges = true);
 
 }  // namespace cugraph
-
-/**
- * @}
- */
diff --git a/cpp/include/cugraph/legacy/graph.hpp b/cpp/include/cugraph/legacy/graph.hpp
index 18d57533d6..088d4cc6eb 100644
--- a/cpp/include/cugraph/legacy/graph.hpp
+++ b/cpp/include/cugraph/legacy/graph.hpp
@@ -51,11 +51,8 @@ enum class DegreeDirection {
 /** @defgroup legacy_graph_cpp C++ Legacy Graph
  */
 
-/** @ingroup legacy_graph_cpp
- *  @{
- */
-
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       Base class graphs, all but vertices and edges
  *
  * @tparam vertex_t   Type of vertex id
@@ -86,6 +83,7 @@ class GraphViewBase {
   vertex_t get_local_vertex_first() const { return vertex_t{0}; }
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Fill the identifiers array with the vertex identifiers.
    *
    * @param[out]    identifiers      Pointer to device memory to store the vertex
@@ -118,6 +116,7 @@ class GraphViewBase {
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       A graph stored in COO (COOrdinate) format.
  *
  * @tparam vertex_t   Type of vertex id
@@ -131,6 +130,7 @@ class GraphCOOView : public GraphViewBase<vertex_t, edge_t, weight_t> {
   vertex_t* dst_indices{nullptr};  ///< colInd
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief     Computes degree(in, out, in+out) of all the nodes of a Graph
    *
    * @throws     cugraph::logic_error when an error occurs.
@@ -148,6 +148,7 @@ class GraphCOOView : public GraphViewBase<vertex_t, edge_t, weight_t> {
   GraphCOOView() : GraphViewBase<vertex_t, edge_t, weight_t>(nullptr, 0, 0) {}
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Wrap existing arrays representing an edge list in a Graph.
    *
    *             GraphCOOView does not own the memory used to represent this
@@ -180,6 +181,7 @@ class GraphCOOView : public GraphViewBase<vertex_t, edge_t, weight_t> {
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       Base class for graph stored in CSR (Compressed Sparse Row)
  * format or CSC (Compressed
  * Sparse Column) format
@@ -195,6 +197,7 @@ class GraphCompressedSparseBaseView : public GraphViewBase<vertex_t, edge_t, wei
   vertex_t* indices{nullptr};  ///< CSR indices
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Fill the identifiers in the array with the source vertex
    * identifiers
    *
@@ -204,6 +207,7 @@ class GraphCompressedSparseBaseView : public GraphViewBase<vertex_t, edge_t, wei
   void get_source_indices(vertex_t* src_indices) const;
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief     Computes degree(in, out, in+out) of all the nodes of a Graph
    *
    * @throws     cugraph::logic_error when an error occurs.
@@ -220,6 +224,7 @@ class GraphCompressedSparseBaseView : public GraphViewBase<vertex_t, edge_t, wei
   void degree(edge_t* degree, DegreeDirection direction) const;
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Wrap existing arrays representing adjacency lists in a Graph.
    *             GraphCSRView does not own the memory used to represent this
    * graph. This
@@ -253,6 +258,7 @@ class GraphCompressedSparseBaseView : public GraphViewBase<vertex_t, edge_t, wei
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       A graph stored in CSR (Compressed Sparse Row) format.
  *
  * @tparam vertex_t   Type of vertex id
@@ -271,6 +277,7 @@ class GraphCSRView : public GraphCompressedSparseBaseView<vertex_t, edge_t, weig
   }
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Wrap existing arrays representing adjacency lists in a Graph.
    *             GraphCSRView does not own the memory used to represent this
    * graph. This
@@ -303,6 +310,7 @@ class GraphCSRView : public GraphCompressedSparseBaseView<vertex_t, edge_t, weig
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief      TODO : Change this Take ownership of the provided graph arrays in
  * COO format
  *
@@ -329,6 +337,7 @@ struct GraphCOOContents {
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       A constructed graph stored in COO (COOrdinate) format.
  *
  * This class will src_indices and dst_indicies (until moved)
@@ -347,6 +356,7 @@ class GraphCOO {
 
  public:
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Take ownership of the provided graph arrays in COO format
    *
    * @param  number_of_vertices    The number of vertices in the graph
@@ -429,6 +439,7 @@ struct GraphSparseContents {
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       Base class for constructted graphs stored in CSR (Compressed
  * Sparse Row) format or
  * CSC (Compressed Sparse Column) format
@@ -453,6 +464,7 @@ class GraphCompressedSparseBase {
   //}
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Take ownership of the provided graph arrays in CSR/CSC format
    *
    * @param  number_of_vertices    The number of vertices in the graph
@@ -507,6 +519,7 @@ class GraphCompressedSparseBase {
 };
 
 /**
+ * @ingroup legacy_graph_cpp
  * @brief       A constructed graph stored in CSR (Compressed Sparse Row)
  * format.
  *
@@ -519,10 +532,13 @@ class GraphCSR : public GraphCompressedSparseBase<vertex_t, edge_t, weight_t> {
  public:
   /**
    * @brief      Default constructor
+   * @ingroup legacy_graph_cpp
+
    */
   GraphCSR() : GraphCompressedSparseBase<vertex_t, edge_t, weight_t>() {}
 
   /**
+   * @ingroup legacy_graph_cpp
    * @brief      Take ownership of the provided graph arrays in CSR format
    *
    * @param  number_of_vertices    The number of vertices in the graph
@@ -582,7 +598,3 @@ struct invalid_edge_id : invalid_idx<edge_t> {};
 }  // namespace cugraph
 
 #include "eidecl_graph.hpp"
-
-/**
- * @}
- */
diff --git a/cpp/tests/sampling/detail/nbr_sampling_validate.cu b/cpp/tests/sampling/detail/nbr_sampling_validate.cu
index f399b7542e..f360b6c04d 100644
--- a/cpp/tests/sampling/detail/nbr_sampling_validate.cu
+++ b/cpp/tests/sampling/detail/nbr_sampling_validate.cu
@@ -28,6 +28,7 @@
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 
+#include <cuda/std/functional>
 #include <thrust/count.h>
 #include <thrust/distance.h>
 #include <thrust/equal.h>
@@ -275,7 +276,7 @@ bool validate_sampling_depth(raft::handle_t const& handle,
                         tuple_iter + d_distances.size(),
                         d_distances.begin(),
                         [] __device__(auto tuple) {
-                          return thrust::min(thrust::get<0>(tuple), thrust::get<1>(tuple));
+                          return cuda::std::min(thrust::get<0>(tuple), thrust::get<1>(tuple));
                         });
     }
   }
diff --git a/cpp/tests/utilities/check_utilities.hpp b/cpp/tests/utilities/check_utilities.hpp
index 68b4ef88dd..a22d95c87d 100644
--- a/cpp/tests/utilities/check_utilities.hpp
+++ b/cpp/tests/utilities/check_utilities.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 #include <raft/core/handle.hpp>
 #include <raft/core/span.hpp>
 
+#include <cuda/std/functional>
+
 #include <numeric>
 #include <type_traits>
 #include <vector>
@@ -95,7 +97,7 @@ struct device_nearly_equal {
   bool __device__ operator()(type_t lhs, type_t rhs) const
   {
     return std::abs(lhs - rhs) <
-           thrust::max(thrust::max(lhs, rhs) * threshold_ratio, threshold_magnitude);
+           cuda::std::max(thrust::max(lhs, rhs) * threshold_ratio, threshold_magnitude);
   }
 };
 
diff --git a/dependencies.yaml b/dependencies.yaml
index 318374469d..ba1bc20add 100755
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -402,7 +402,7 @@ dependencies:
       - output_types: [conda, pyproject]
         packages:
           - &dask rapids-dask-dependency==25.2.*,>=0.0.0a0
-          - &numba numba>=0.57
+          - &numba numba>=0.59.1,<0.61.0a0
           - &numpy numpy>=1.23,<3.0a0
       - output_types: conda
         packages:
diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml
index ec75af55cb..b265a9c945 100644
--- a/python/cugraph-service/server/pyproject.toml
+++ b/python/cugraph-service/server/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
     "cupy-cuda11x>=12.0.0",
     "dask-cuda==25.2.*,>=0.0.0a0",
     "dask-cudf==25.2.*,>=0.0.0a0",
-    "numba>=0.57",
+    "numba>=0.59.1,<0.61.0a0",
     "numpy>=1.23,<3.0a0",
     "rapids-dask-dependency==25.2.*,>=0.0.0a0",
     "rmm==25.2.*,>=0.0.0a0",
diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml
index 398e3b6099..dfe3b085fd 100644
--- a/python/cugraph/pyproject.toml
+++ b/python/cugraph/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
     "dask-cudf==25.2.*,>=0.0.0a0",
     "fsspec[http]>=0.6.0",
     "libcugraph==25.2.*,>=0.0.0a0",
-    "numba>=0.57",
+    "numba>=0.59.1,<0.61.0a0",
     "numpy>=1.23,<3.0a0",
     "pylibcugraph==25.2.*,>=0.0.0a0",
     "pylibraft==25.2.*,>=0.0.0a0",