diff --git a/ci-prepare-bionic.sh b/ci-prepare-bionic.sh
index fa3b2d2..3a3abac 100755
--- a/ci-prepare-bionic.sh
+++ b/ci-prepare-bionic.sh
@@ -143,9 +143,12 @@ setup_nvhpc() {
   local bin_dir="$sdk_dir/compilers/bin"
   "$bin_dir/makelocalrc" "$bin_dir" -x
 
+  export_var NVHPC_SDK_DIR "$sdk_dir"
+  export_var NVHPC_CUDA_DIR "$sdk_dir/cuda/11.3"
+
   export_var NVHPC_NVCXX "$bin_dir/nvc++"
   export_var NVHPC_NVCC "$sdk_dir/cuda/11.3/bin/nvcc"
-  export_var NVHPC_CUDA_DIR "$sdk_dir/cuda/11.3"
+
   echo "Installed CUDA versions:"
   ls "$sdk_dir/cuda"
   verify_bin_exists "$NVHPC_NVCXX"
@@ -249,7 +252,7 @@ setup_clang_gcc() {
 
 setup_rocm() {
   wget -q -O - "https://repo.radeon.com/rocm/rocm.gpg.key" | sudo apt-key add -
-  echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ xenial main' | sudo tee /etc/apt/sources.list.d/rocm.list
+  echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/4.5 ubuntu main' | sudo tee /etc/apt/sources.list.d/rocm.list
   sudo apt-get update -qq
   sudo apt-get install -y -qq rocm-dev
   export_var ROCM_PATH "/opt/rocm"
diff --git a/ci-test-compile.sh b/ci-test-compile.sh
index 0a162f2..e56931c 100755
--- a/ci-test-compile.sh
+++ b/ci-test-compile.sh
@@ -92,11 +92,11 @@ run_build() {
 # GCC_CXX="/usr/bin/g++"
 # CLANG_CXX="/usr/bin/clang++"
 
-# NVSDK="/home/tom/Downloads/nvhpc_2021_212_Linux_x86_64_cuda_11.2/install_components/Linux_x86_64/21.2/"
-# NVHPC_NVCXX="$NVSDK/compilers/bin/nvc++"
-# NVHPC_NVCC="$NVSDK/cuda/11.2/bin/nvcc"
-# NVHPC_CUDA_DIR="$NVSDK/cuda/11.2"
-# "$NVSDK/compilers/bin/makelocalrc" "$NVSDK/compilers/bin/" -x
+# NVHPC_SDK_DIR="/home/tom/Downloads/nvhpc_2021_212_Linux_x86_64_cuda_11.2/install_components/Linux_x86_64/21.2/"
+# NVHPC_NVCXX="$NVHPC_SDK_DIR/compilers/bin/nvc++"
+# NVHPC_NVCC="$NVHPC_SDK_DIR/cuda/11.2/bin/nvcc"
+# NVHPC_CUDA_DIR="$NVHPC_SDK_DIR/cuda/11.2"
+# "$NVHPC_SDK_DIR/compilers/bin/makelocalrc" "$NVHPC_SDK_DIR/compilers/bin/" -x
 
 # AOCC_CXX="/opt/AMD/aocc-compiler-2.3.0/bin/clang++"
 # AOMP_CXX="/usr/lib/aomp/bin/clang++"
@@ -171,10 +171,10 @@ build_gcc() {
 #  -DCUDA_TOOLKIT_ROOT_DIR=${NVHPC_CUDA_DIR:?} \
 #  -DCUDA_ARCH=$NV_ARCH"
 
-  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVSDK/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=CUDA"
-  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVSDK/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=OMP"
-  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVSDK/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=TBB"
-  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVSDK/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=CPP"
+  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_SDK_DIR/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=CUDA"
+  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_SDK_DIR/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=OMP"
+  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_SDK_DIR/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=TBB"
+  run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_SDK_DIR/cuda/include/thrust -DTHRUST_IMPL=CUDA -DBACKEND=CPP"
 
 }