diff --git a/projects/rocprofiler-systems/CMakeLists.txt b/projects/rocprofiler-systems/CMakeLists.txt
index 123e04ebc1..ab2d30867f 100644
--- a/projects/rocprofiler-systems/CMakeLists.txt
+++ b/projects/rocprofiler-systems/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 if(
     CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR
diff --git a/projects/rocprofiler-systems/cmake/DyninstTBBInstall.cmake b/projects/rocprofiler-systems/cmake/DyninstTBBInstall.cmake
index efebee6f11..689dbbf7bb 100644
--- a/projects/rocprofiler-systems/cmake/DyninstTBBInstall.cmake
+++ b/projects/rocprofiler-systems/cmake/DyninstTBBInstall.cmake
@@ -9,7 +9,7 @@
 #
 # ########################################################################################
 
-cmake_minimum_required(VERSION 3.13.0)
+cmake_minimum_required(VERSION 3.21)
 
 if(NOT CMAKE_STRIP)
     find_program(CMAKE_STRIP NAMES strip)
diff --git a/projects/rocprofiler-systems/cmake/Modules/FindLibIberty.cmake b/projects/rocprofiler-systems/cmake/Modules/FindLibIberty.cmake
index 36d38db4ab..989efb3124 100644
--- a/projects/rocprofiler-systems/cmake/Modules/FindLibIberty.cmake
+++ b/projects/rocprofiler-systems/cmake/Modules/FindLibIberty.cmake
@@ -27,7 +27,7 @@
 #
 # ========================================================================================
 
-cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 # Keep the semantics of IBERTY_LIBRARIES for backward compatibility NB: If both are
 # specified, LibIberty_LIBRARIES is ignored
diff --git a/projects/rocprofiler-systems/examples/CMakeLists.txt b/projects/rocprofiler-systems/examples/CMakeLists.txt
index 9c29d29dd3..ef13a4e223 100644
--- a/projects/rocprofiler-systems/examples/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/CMakeLists.txt
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-examples LANGUAGES C CXX)
 
diff --git a/projects/rocprofiler-systems/examples/causal/CMakeLists.txt b/projects/rocprofiler-systems/examples/causal/CMakeLists.txt
index 31bf1eb567..e0059abe6d 100644
--- a/projects/rocprofiler-systems/examples/causal/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/causal/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-causal-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/code-coverage/CMakeLists.txt b/projects/rocprofiler-systems/examples/code-coverage/CMakeLists.txt
index 07ecbd7873..60d474bd23 100644
--- a/projects/rocprofiler-systems/examples/code-coverage/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/code-coverage/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-code-coverage-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/fork/CMakeLists.txt b/projects/rocprofiler-systems/examples/fork/CMakeLists.txt
index e52894c1d2..c2448a7012 100644
--- a/projects/rocprofiler-systems/examples/fork/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/fork/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-fork LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
index bc1eed1d55..ba5bc9fb6b 100644
--- a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
@@ -21,7 +21,7 @@
 #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 # This example requires hip and rocjpeg.
 find_package(HIP QUIET)
diff --git a/projects/rocprofiler-systems/examples/lulesh/CMakeLists.txt b/projects/rocprofiler-systems/examples/lulesh/CMakeLists.txt
index 8402b3685d..9fd7935d3e 100644
--- a/projects/rocprofiler-systems/examples/lulesh/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/lulesh/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-lulesh-example LANGUAGES C CXX)
 
diff --git a/projects/rocprofiler-systems/examples/mpi/CMakeLists.txt b/projects/rocprofiler-systems/examples/mpi/CMakeLists.txt
index 24b1bf0208..2ff4043a3c 100644
--- a/projects/rocprofiler-systems/examples/mpi/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/mpi/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-mpi-examples LANGUAGES C CXX)
 
diff --git a/projects/rocprofiler-systems/examples/openmp/CMakeLists.txt b/projects/rocprofiler-systems/examples/openmp/CMakeLists.txt
index 1354f832af..f143d1eb2a 100644
--- a/projects/rocprofiler-systems/examples/openmp/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/openmp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-openmp LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/openmp/target/CMakeLists.txt b/projects/rocprofiler-systems/examples/openmp/target/CMakeLists.txt
index 7c20f21b09..0dbab81bf3 100644
--- a/projects/rocprofiler-systems/examples/openmp/target/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/openmp/target/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 if(NOT OMP_TARGET_COMPILER)
     find_program(
diff --git a/projects/rocprofiler-systems/examples/parallel-overhead/CMakeLists.txt b/projects/rocprofiler-systems/examples/parallel-overhead/CMakeLists.txt
index c28b326c93..8737781185 100644
--- a/projects/rocprofiler-systems/examples/parallel-overhead/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/parallel-overhead/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-parallel-overhead-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/python/CMakeLists.txt b/projects/rocprofiler-systems/examples/python/CMakeLists.txt
index d88c0b597b..29b370b3ca 100644
--- a/projects/rocprofiler-systems/examples/python/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-python)
 
diff --git a/projects/rocprofiler-systems/examples/rccl/CMakeLists.txt b/projects/rocprofiler-systems/examples/rccl/CMakeLists.txt
index 6546183efb..0e69df1dbb 100644
--- a/projects/rocprofiler-systems/examples/rccl/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/rccl/CMakeLists.txt
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-rccl-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/rewrite-caller/CMakeLists.txt b/projects/rocprofiler-systems/examples/rewrite-caller/CMakeLists.txt
index 658fecb812..aa1b7a0b34 100644
--- a/projects/rocprofiler-systems/examples/rewrite-caller/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/rewrite-caller/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-rewrite-caller-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/roctx/CMakeLists.txt b/projects/rocprofiler-systems/examples/roctx/CMakeLists.txt
index 673901133c..f5f7dd19c6 100644
--- a/projects/rocprofiler-systems/examples/roctx/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/roctx/CMakeLists.txt
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-roctx-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/trace-time-window/CMakeLists.txt b/projects/rocprofiler-systems/examples/trace-time-window/CMakeLists.txt
index 17552a759f..3a8f396ba2 100644
--- a/projects/rocprofiler-systems/examples/trace-time-window/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/trace-time-window/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-trace-time-window-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/transpose/CMakeLists.txt b/projects/rocprofiler-systems/examples/transpose/CMakeLists.txt
index d2e430131b..2406674764 100644
--- a/projects/rocprofiler-systems/examples/transpose/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/transpose/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-transpose-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/user-api/CMakeLists.txt b/projects/rocprofiler-systems/examples/user-api/CMakeLists.txt
index 772a2700b5..cf99ae647c 100644
--- a/projects/rocprofiler-systems/examples/user-api/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/user-api/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-user-api-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt b/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
index 4e4a5bb5a7..ace4a9a189 100644
--- a/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(rocprofiler-systems-videodecode-example LANGUAGES CXX)
 
diff --git a/projects/rocprofiler-systems/scripts/run-ci.sh b/projects/rocprofiler-systems/scripts/run-ci.sh
index 6da6032431..4f5540e95a 100755
--- a/projects/rocprofiler-systems/scripts/run-ci.sh
+++ b/projects/rocprofiler-systems/scripts/run-ci.sh
@@ -229,7 +229,7 @@ EOF
 verbose-run cd ${BINARY_DIR}
 
 cat << EOF > dashboard.cmake
-cmake_minimum_required(VERSION 3.18.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 include("\${CMAKE_CURRENT_LIST_DIR}/CTestCustom.cmake")
 
diff --git a/projects/rocprofiler-systems/scripts/test-find-package.sh b/projects/rocprofiler-systems/scripts/test-find-package.sh
index ac41079795..f4770cacfb 100755
--- a/projects/rocprofiler-systems/scripts/test-find-package.sh
+++ b/projects/rocprofiler-systems/scripts/test-find-package.sh
@@ -134,7 +134,7 @@ verbose-run cp -v -r ${EXAMPLE_DIR}/${EXAMPLE_NAME}/* ${SOURCE_DIR}/
 verbose-run pushd ${SOURCE_DIR}
 
 cat << EOF > CMakeLists.txt
-cmake_minimum_required(VERSION 3.18.4.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
 project(test LANGUAGES C CXX)
 
diff --git a/projects/rocprofiler-systems/scripts/write-rocprof-sys-install.cmake b/projects/rocprofiler-systems/scripts/write-rocprof-sys-install.cmake
index b01c729aae..6540bddcac 100644
--- a/projects/rocprofiler-systems/scripts/write-rocprof-sys-install.cmake
+++ b/projects/rocprofiler-systems/scripts/write-rocprof-sys-install.cmake
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.18.4)
+cmake_minimum_required(VERSION 3.21)
 
 if(NOT DEFINED ROCPROFSYS_VERSION)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/../VERSION" FULL_VERSION_STRING LIMIT_COUNT 1)
diff --git a/projects/rocprofiler-systems/source/lib/rocprof-sys-rt/CMakeLists.txt b/projects/rocprofiler-systems/source/lib/rocprof-sys-rt/CMakeLists.txt
index 8e5bae0bf6..b7d3b73aae 100644
--- a/projects/rocprofiler-systems/source/lib/rocprof-sys-rt/CMakeLists.txt
+++ b/projects/rocprofiler-systems/source/lib/rocprof-sys-rt/CMakeLists.txt
@@ -5,6 +5,9 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_EXTENSIONS ON)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
+# Ensure .S files are compiled as assembly
+set(NEED_NATIVE_ASSEMBLER ON)
+
 # ------------------------------------------------------------------------------#
 # target sources
 # ------------------------------------------------------------------------------#
@@ -73,7 +76,7 @@ set(RT_STATIC_ONLY_SRC_LIST_aarch64 src/RTstatic_ctors_dtors-aarch64.c)
 # that gcc can handle .S.
 enable_language(ASM)
 file(GLOB SRC_ASSEMBLY "src/*.S")
-if(NEED_NATIVE_ASSEMBER)
+if(NEED_NATIVE_ASSEMBLER)
     set_source_files_properties(${SRC_ASSEMBLY} PROPERTIES LANGUAGE ASM)
 else()
     set_source_files_properties(${SRC_ASSEMBLY} PROPERTIES LANGUAGE C)