diff --git a/Control/AthCUDA/AthCUDAKernel/CMakeLists.txt b/Control/AthCUDA/AthCUDAKernel/CMakeLists.txt
index d9d141a8422ac6d482a38fc9de730f931cca9410..fa7f974ae64ceda2e369fc14f27b0c645446968c 100644
--- a/Control/AthCUDA/AthCUDAKernel/CMakeLists.txt
+++ b/Control/AthCUDA/AthCUDAKernel/CMakeLists.txt
@@ -12,6 +12,10 @@ atlas_add_library( AthCUDAKernelLib
 set_target_properties( AthCUDAKernelLib PROPERTIES
    POSITION_INDEPENDENT_CODE ON )
 
+# Disable faulty "declared but never used" warnings for the template code.
+target_compile_options( AthCUDAKernelLib PUBLIC
+   $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=177> )
+
 # Test(s) in the package.
 atlas_add_test( ArrayKernelTask
    SOURCES test/test_ArrayKernelTask.cu
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 252407a1407576b0d779b883d252b6e4aa4a23df..ab4d06b59aa115fb53ae1ade0fd849e1a5e0d32e 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -12,6 +12,11 @@ include( CheckLanguage )
 check_language( CUDA )
 if( CMAKE_CUDA_COMPILER )
    enable_language( CUDA )
+   # Force the compilation of CUDA code for only compute capability 5.2 for now.
+   # To get rid of warnings from 11.0 about not supporting older compute
+   # capabilities anymore.
+   set( CMAKE_CUDA_ARCHITECTURES "52" CACHE STRING
+      "CUDA architectures to build code for" )
 endif()
 
 # Set the versions of the TDAQ externals to pick up for the build:
diff --git a/Projects/WorkDir/CMakeLists.txt b/Projects/WorkDir/CMakeLists.txt
index 181e4ee937cb668ea93008a3ae8518ae83c5456c..6a3ee4da643591cac8138cdaa6e92b6239ce571e 100644
--- a/Projects/WorkDir/CMakeLists.txt
+++ b/Projects/WorkDir/CMakeLists.txt
@@ -10,6 +10,12 @@ cmake_minimum_required( VERSION 3.10 )
 # the version and languages.
 project( WorkDir )
 
+# Force the compilation of CUDA code for only compute capability 5.2 for now.
+# To get rid of warnings from 11.0 about not supporting older compute
+# capabilities anymore.
+set( CMAKE_CUDA_ARCHITECTURES "52" CACHE STRING
+   "CUDA architectures to build code for" )
+
 # Let the user pick up updated AtlasCMake/AtlasLCG versions for testing.
 # Remember that it's not a problem if AtlasCMake is not found, that's why
 # we use the QUIET keyword.