diff --git a/.gitmodules b/.gitmodules
index a1a418af16..5741482e89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,7 +32,7 @@
 [submodule "rocm-libraries"]
 	path = rocm-libraries
 	url = https://github.com/ROCm/rocm-libraries
-	branch = develop
+	branch = users/davidd-amd/tensile-rocblas-cmake-update
 [submodule "rocm-systems"]
 	path = rocm-systems
 	url = https://github.com/ROCm/rocm-systems.git
diff --git a/comm-libs/rccl b/comm-libs/rccl
index d23d18f423..acdafac49f 160000
--- a/comm-libs/rccl
+++ b/comm-libs/rccl
@@ -1 +1 @@
-Subproject commit d23d18f423d661556a5091f0dc9f27dec2adf67f
+Subproject commit acdafac49f8b87c8704b3447a3ed3fa0c429a34e
diff --git a/comm-libs/rccl-tests b/comm-libs/rccl-tests
index e1b8a3aefc..6405c76e68 160000
--- a/comm-libs/rccl-tests
+++ b/comm-libs/rccl-tests
@@ -1 +1 @@
-Subproject commit e1b8a3aefcdf6482f0f5a35224e19eed2acc685d
+Subproject commit 6405c76e6826663bbb67bd40aeee8c70aa5d3094
diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt
index 7812772126..6849f81a06 100644
--- a/math-libs/BLAS/CMakeLists.txt
+++ b/math-libs/BLAS/CMakeLists.txt
@@ -187,6 +187,7 @@ therock_cmake_subproject_declare(rocBLAS
     -DTENSILE_VERSION=
     -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING}
     -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING}
+    -DROCBLAS_ENABLE_SAMPLES=OFF
     -DLINK_BLIS=OFF
   CMAKE_INCLUDES
     therock_explicit_finders.cmake
diff --git a/ml-libs/composable_kernel b/ml-libs/composable_kernel
index 0be0288f58..d184eed823 160000
--- a/ml-libs/composable_kernel
+++ b/ml-libs/composable_kernel
@@ -1 +1 @@
-Subproject commit 0be0288f58879123c228373525c4b438d354694f
+Subproject commit d184eed823ca50dcafc57c66228f12300c0c9ccc
diff --git a/patches/amd-mainline/rocm-libraries/0003-Find-rocm_smi-via-config-files.patch b/patches/amd-mainline/rocm-libraries/0003-Find-rocm_smi-via-config-files.patch
deleted file mode 100644
index 54dd4f5de7..0000000000
--- a/patches/amd-mainline/rocm-libraries/0003-Find-rocm_smi-via-config-files.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 368062f5a23460955ef62ebd6d169d11cbffa331 Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@amd.com>
-Date: Wed, 12 Mar 2025 14:26:45 +0000
-Subject: [PATCH 03/12] Find `rocm_smi` via config files
-
-Use the config files provided by upstream instead of a custom finder.
----
- projects/rocblas/clients/CMakeLists.txt       |  4 +-
- .../rocblas/clients/cmake/FindROCmSMI.cmake   | 51 -------------------
- 2 files changed, 2 insertions(+), 53 deletions(-)
- delete mode 100644 projects/rocblas/clients/cmake/FindROCmSMI.cmake
-
-diff --git a/projects/rocblas/clients/CMakeLists.txt b/projects/rocblas/clients/CMakeLists.txt
-index b9e1dc4816..0f326755a0 100644
---- a/projects/rocblas/clients/CMakeLists.txt
-+++ b/projects/rocblas/clients/CMakeLists.txt
-@@ -210,8 +210,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
- 
-   # Find the package ROCmSMI
-   if(NOT WIN32)
--      find_package(ROCmSMI REQUIRED)
--      list( APPEND COMMON_LINK_LIBS rocm_smi )
-+      find_package(rocm_smi CONFIG REQUIRED)
-+      list( APPEND COMMON_LINK_LIBS rocm_smi64 )
-   endif()
- 
-   find_package( GTest REQUIRED )
-diff --git a/projects/rocblas/clients/cmake/FindROCmSMI.cmake b/projects/rocblas/clients/cmake/FindROCmSMI.cmake
-deleted file mode 100644
-index 698f6884a6..0000000000
---- a/projects/rocblas/clients/cmake/FindROCmSMI.cmake
-+++ /dev/null
-@@ -1,51 +0,0 @@
--# ########################################################################
--# Copyright (C) 2016-2024 Advanced Micro Devices, Inc. All rights reserved.
--#
--# Permission is hereby granted, free of charge, to any person obtaining a copy
--# of this software and associated documentation files (the "Software"), to deal
--# in the Software without restriction, including without limitation the rights
--# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell cop-
--# ies of the Software, and to permit persons to whom the Software is furnished
--# to do so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included in all
--# copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IM-
--# PLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
--# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
--# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
--# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNE-
--# CTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--#
--# ########################################################################
--
--if(NOT ROCM_ROOT)
--    if(NOT ROCM_DIR)
--        set(ROCM_ROOT "/opt/rocm")
--    else()
--        set(ROCM_DIR "${ROCM_DIR}/../../..")
--    endif()
--endif()
--
--
--# For some reason the *_DIR variables have inconsistent values between Tensile and rocBLAS.  Search various paths.
--find_path(ROCM_SMI_ROOT "include/rocm_smi/rocm_smi.h"
--    PATHS "${ROCM_ROOT}" "${HIP_DIR}/../../../.." "${HIP_DIR}/../../.."
--    PATH_SUFFIXES "rocm_smi"
--    )
--mark_as_advanced(ROCM_SMI_ROOT)
--
--find_library(ROCM_SMI_LIBRARY rocm_smi64
--    PATHS "${ROCM_SMI_ROOT}/lib")
--mark_as_advanced(ROCM_SMI_LIBRARY)
--
--include( FindPackageHandleStandardArgs )
--find_package_handle_standard_args( ROCmSMI DEFAULT_MSG ROCM_SMI_LIBRARY ROCM_SMI_ROOT )
--
--add_library(rocm_smi SHARED IMPORTED)
--
--set_target_properties(rocm_smi PROPERTIES
--    INTERFACE_INCLUDE_DIRECTORIES "${ROCM_SMI_ROOT}/include"
--    IMPORTED_LOCATION "${ROCM_SMI_LIBRARY}"
--    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${ROCM_SMI_ROOT}/include")
--- 
-2.47.1.windows.2
-
diff --git a/profiler/rocprof-trace-decoder/binaries b/profiler/rocprof-trace-decoder/binaries
index 6bdb753042..e2609d6e2c 160000
--- a/profiler/rocprof-trace-decoder/binaries
+++ b/profiler/rocprof-trace-decoder/binaries
@@ -1 +1 @@
-Subproject commit 6bdb7530421c0d66ee379c340315649a2e0b11d5
+Subproject commit e2609d6e2ce1ab6fba6f7e095fc614ccd8b772ae
diff --git a/rocm-libraries b/rocm-libraries
index e7f42d4a46..1fadd1c082 160000
--- a/rocm-libraries
+++ b/rocm-libraries
@@ -1 +1 @@
-Subproject commit e7f42d4a468e153e9a41e7bd76f2821aedfab787
+Subproject commit 1fadd1c08205cab097d13932d225d003ee79cace