diff --git a/src/ci-prepare-bionic.sh b/src/ci-prepare-bionic.sh
index 0684f35..78bbd33 100755
--- a/src/ci-prepare-bionic.sh
+++ b/src/ci-prepare-bionic.sh
@@ -152,6 +152,7 @@ setup_nvhpc() {
 
   export_var NVHPC_NVCXX "$bin_dir/nvc++"
   export_var NVHPC_NVCC "$bin_dir/nvcc"
+  export_var NVHPC_CUDA_VER "$cuda_ver"
 #  export_var NVHPC_NVCC "$sdk_dir/cuda/$cuda_ver/bin/nvcc"
 
   echo "Installed CUDA versions:"
diff --git a/src/ci-test-compile.sh b/src/ci-test-compile.sh
index 9388643..7e17379 100755
--- a/src/ci-test-compile.sh
+++ b/src/ci-test-compile.sh
@@ -122,7 +122,7 @@ run_build() {
 
 AMD_ARCH="gfx_903"
 NV_ARCH="sm_70"
-NV_ARCH_CCXY="cuda11.4,cc80"
+NV_ARCH_CCXY="cuda${NVHPC_CUDA_VER:?},cc80"
 
 build_gcc() {
   local name="gcc_build"