diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index d2bae4a..cba1fb9 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -11,23 +11,23 @@ jobs:
       linux_64_cuda_compiler_version10.0:
         CONFIG: linux_64_cuda_compiler_version10.0
         UPLOAD_PACKAGES: 'True'
-        DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:10.0
       linux_64_cuda_compiler_version10.1:
         CONFIG: linux_64_cuda_compiler_version10.1
         UPLOAD_PACKAGES: 'True'
-        DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:10.1
       linux_64_cuda_compiler_version10.2:
         CONFIG: linux_64_cuda_compiler_version10.2
         UPLOAD_PACKAGES: 'True'
-        DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:10.2
       linux_64_cuda_compiler_version11.0:
         CONFIG: linux_64_cuda_compiler_version11.0
         UPLOAD_PACKAGES: 'True'
-        DOCKER_IMAGE: condaforge/linux-anvil-cuda:11.0
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0
       linux_64_cuda_compiler_version9.2:
         CONFIG: linux_64_cuda_compiler_version9.2
         UPLOAD_PACKAGES: 'True'
-        DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:9.2
   timeoutInMinutes: 360
 
   steps:
diff --git a/.ci_support/linux_64_cuda_compiler_version10.0.yaml b/.ci_support/linux_64_cuda_compiler_version10.0.yaml
index c8b4e1d..a8a1124 100644
--- a/.ci_support/linux_64_cuda_compiler_version10.0.yaml
+++ b/.ci_support/linux_64_cuda_compiler_version10.0.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '7'
 docker_image:
-- condaforge/linux-anvil-cuda:10.0
+- quay.io/condaforge/linux-anvil-cuda:10.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_cuda_compiler_version10.1.yaml b/.ci_support/linux_64_cuda_compiler_version10.1.yaml
index 2dbf357..06d31b5 100644
--- a/.ci_support/linux_64_cuda_compiler_version10.1.yaml
+++ b/.ci_support/linux_64_cuda_compiler_version10.1.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '7'
 docker_image:
-- condaforge/linux-anvil-cuda:10.1
+- quay.io/condaforge/linux-anvil-cuda:10.1
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cuda_compiler_version10.2.yaml
index 193e165..ad1426d 100644
--- a/.ci_support/linux_64_cuda_compiler_version10.2.yaml
+++ b/.ci_support/linux_64_cuda_compiler_version10.2.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '7'
 docker_image:
-- condaforge/linux-anvil-cuda:10.2
+- quay.io/condaforge/linux-anvil-cuda:10.2
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_cuda_compiler_version11.0.yaml b/.ci_support/linux_64_cuda_compiler_version11.0.yaml
index 05a2cf8..cf3af8e 100644
--- a/.ci_support/linux_64_cuda_compiler_version11.0.yaml
+++ b/.ci_support/linux_64_cuda_compiler_version11.0.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '9'
 cdt_name:
 - cos6
 channel_sources:
@@ -15,9 +15,9 @@ cuda_compiler_version:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '9'
 docker_image:
-- condaforge/linux-anvil-cuda:11.0
+- quay.io/condaforge/linux-anvil-cuda:11.0
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_cuda_compiler_version9.2.yaml b/.ci_support/linux_64_cuda_compiler_version9.2.yaml
index 0d122ef..1d2a3fe 100644
--- a/.ci_support/linux_64_cuda_compiler_version9.2.yaml
+++ b/.ci_support/linux_64_cuda_compiler_version9.2.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '7'
 docker_image:
-- condaforge/linux-anvil-cuda:9.2
+- quay.io/condaforge/linux-anvil-cuda:9.2
 target_platform:
 - linux-64
 zip_keys:
diff --git a/recipe/install_nvcc.sh b/recipe/install_nvcc.sh
index 591df10..2d8e477 100755
--- a/recipe/install_nvcc.sh
+++ b/recipe/install_nvcc.sh
@@ -122,8 +122,14 @@ EOF
 
 # Create `nvcc` script in `bin` so it can be easily run.
 mkdir -p "${PREFIX}/bin"
-cat > "${PREFIX}/bin/nvcc" <<EOF
+cat > "${PREFIX}/bin/nvcc" <<'EOF'
 #!/bin/bash
-"\${CUDA_HOME}/bin/nvcc" -ccbin "\${CXX}" \$@
+for arg in "${@}" ; do
+  case ${arg} in -ccbin)
+    # If -ccbin argument is already provided, don't add an additional one.
+    exec "${CUDA_HOME}/bin/nvcc" "${@}"
+  esac
+done
+exec "${CUDA_HOME}/bin/nvcc" -ccbin "${CXX}" "${@}"
 EOF
 chmod +x "${PREFIX}/bin/nvcc"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 9734630..8697287 100755
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "nvcc" %}
-{% set number = 7 %}
+{% set number = 8 %}
 
 package:
   name: "{{ name }}"