diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
index b01f6c33..3728eae6 100644
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@@ -45,7 +45,7 @@ foreach(benchmark_src ${rocRAND_BENCHMARK_SRCS})
             hip::device 
         )
         foreach(amdgpu_target ${AMDGPU_TARGETS})
-            target_link_libraries(${benchmark_name} --amdgpu-target=${amdgpu_target})
+            target_link_libraries(${benchmark_name} --cuda-gpu-arch=${amdgpu_target})
         endforeach()
     endif()
     set_target_properties(${benchmark_name}
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 33aaca51..943d5e4f 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -87,7 +87,7 @@ set_target_properties(rocrand
 # Set AMD targets
 if(HIP_COMPILER STREQUAL "hcc" OR HIP_COMPILER STREQUAL "clang")
     foreach(amdgpu_target ${AMDGPU_TARGETS})
-        target_link_libraries(rocrand PRIVATE --amdgpu-target=${amdgpu_target})
+        target_link_libraries(rocrand PRIVATE --cuda-gpu-arch=${amdgpu_target})
     endforeach()
 endif()
 
@@ -185,7 +185,7 @@ else()
       target_link_libraries(hiprand PRIVATE rocrand hip::device)
     endif()
     foreach(amdgpu_target ${AMDGPU_TARGETS})
-        target_link_libraries(hiprand PRIVATE --amdgpu-target=${amdgpu_target})
+        target_link_libraries(hiprand PRIVATE --cuda-gpu-arch=${amdgpu_target})
     endforeach()
 endif()
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9c3167c5..f583224c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -54,7 +54,7 @@ foreach(test_src ${rocRAND_TEST_SRCS})
             target_link_libraries(${test_name} hip::device )
         endif()
         foreach(amdgpu_target ${AMDGPU_TARGETS})
-            target_link_libraries(${test_name} --amdgpu-target=${amdgpu_target})
+            target_link_libraries(${test_name} --cuda-gpu-arch=${amdgpu_target})
         endforeach()
     endif()
     set_target_properties(
@@ -111,7 +111,7 @@ foreach(test_src ${hipRAND_TEST_SRCS})
         )
         target_link_libraries(${test_name} hip::device )
         foreach(amdgpu_target ${AMDGPU_TARGETS})
-            target_link_libraries(${test_name} --amdgpu-target=${amdgpu_target})
+            target_link_libraries(${test_name} --cuda-gpu-arch=${amdgpu_target})
         endforeach()
     endif()
     set_target_properties(${test_name}
diff --git a/test/linkage/CMakeLists.txt b/test/linkage/CMakeLists.txt
index a4de41b1..7782a4c1 100644
--- a/test/linkage/CMakeLists.txt
+++ b/test/linkage/CMakeLists.txt
@@ -43,7 +43,7 @@ function(add_rocrand_link_test TEST_SOURCES)
     if(HIP_COMPILER STREQUAL "hcc" OR HIP_COMPILER STREQUAL "clang")
         target_link_libraries(${TEST_TARGET} hip::device)
         foreach(amdgpu_target ${AMDGPU_TARGETS})
-            target_link_libraries(${TEST_TARGET} --amdgpu-target=${amdgpu_target})
+            target_link_libraries(${TEST_TARGET} --cuda-gpu-arch=${amdgpu_target})
         endforeach()
     endif()
     set_target_properties(
@@ -94,7 +94,7 @@ function(add_hiprand_link_test TEST_SOURCES)
         )
         target_link_libraries(${TEST_TARGET} hip::device)
         foreach(amdgpu_target ${AMDGPU_TARGETS})
-            target_link_libraries(${TEST_TARGET} --amdgpu-target=${amdgpu_target})
+            target_link_libraries(${TEST_TARGET} --cuda-gpu-arch=${amdgpu_target})
         endforeach()
     endif()
     set_target_properties(${TEST_TARGET}