diff --git a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt
index cf202b04..490a9840 100644
--- a/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt
@@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-    set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90)
+    # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list
+    if(${BUILD_TEGRA})
+        set(CMAKE_CUDA_ARCHITECTURES 72 87 101)
+    else()
+        set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90)
+    endif()
 else()
     set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
 endif()
diff --git a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt
index a3240953..c5009940 100644
--- a/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/cdpBezierTessellation/CMakeLists.txt
@@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-    set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90)
+    # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list
+    if(${BUILD_TEGRA})
+        set(CMAKE_CUDA_ARCHITECTURES 72 87 101)
+    else()
+        set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90)
+    endif()
 else()
     set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
 endif()
diff --git a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt
index 80e6dc87..1482d98e 100644
--- a/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/cdpQuadtree/CMakeLists.txt
@@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-    set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90)
+    # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list
+    if(${BUILD_TEGRA})
+        set(CMAKE_CUDA_ARCHITECTURES 72 87 101)
+    else()
+        set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90)
+    endif()
 else()
     set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
 endif()
diff --git a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt
index 84a3ce6a..1c1ce00a 100644
--- a/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/cdpSimplePrint/CMakeLists.txt
@@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-    set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90)
+    # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list
+    if(${BUILD_TEGRA})
+        set(CMAKE_CUDA_ARCHITECTURES 72 87 101)
+    else()
+        set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90)
+    endif()
 else()
     set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
 endif()
diff --git a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt
index 7b0e1118..61d60fd2 100644
--- a/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/cdpSimpleQuicksort/CMakeLists.txt
@@ -9,7 +9,12 @@ find_package(CUDAToolkit REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-    set(CMAKE_CUDA_ARCHITECTURES 61 70 75 80 86 87 90)
+    # Need to differentiate Tegra_aarch64 and other aarch64 systems(sbsa_aarch64) as they have different CUDA_ARCHITECTURES list
+    if(${BUILD_TEGRA})
+        set(CMAKE_CUDA_ARCHITECTURES 72 87 101)
+    else()
+        set(CMAKE_CUDA_AR./CCHITECTURES 61 70 75 80 86 90)
+    endif()
 else()
     set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
 endif()
diff --git a/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp b/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp
index f3de8b1e..e6800ab2 100644
--- a/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp
+++ b/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp
@@ -173,7 +173,7 @@ int
 main( int argc, char** argv )
 {
 
-    int      aSegmentationScratchBufferSize[NUMBER_OF_IMAGES];
+    size_t      aSegmentationScratchBufferSize[NUMBER_OF_IMAGES];
     int      aSegmentLabelsOutputBufferSize[NUMBER_OF_IMAGES];
 
     cudaError_t cudaError;