diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index dc28e06ac8e7e630a04a7a6d6467f4542cd3a674..debc5e759265a8359d5dbd96a0cb28f879c3a0c6 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -32,7 +32,7 @@ build_linux:
   extends: .build_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
   cache:
     key: "linux-cache"
 
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 5776ca08ab36d70c6b297ed93166304400850eb7..437bb2138a8d6d947c30e5c7af90130ae53ad572 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -20,7 +20,7 @@ stages:
 .bootstrap:
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
   before_script:
     - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
     - python3 bootstrap.py -vv channel base
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index c8367797df736c30c71ae191e850e89efe4d533e..167122e822e5963f3f11f26a61c745d3c31f46e1 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -42,7 +42,7 @@ stages:
   extends: .build_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
 
 build_linux_37:
   extends: .build_linux_template
@@ -85,7 +85,7 @@ build_macos_intel_38:
   stage: cleanup
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
   script:
     - bdt ci clean-betas -vv
   cache:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 23faf018b464fa240ca4c0066efafc07e696ef66..bcfa865977740c78bcddd76615d1efeec2be34de 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -52,7 +52,7 @@ build_linux:
   extends: .build_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
   variables:
     PYTHON_VERSION: "3.8"
     BUILD_EGG: "true"
@@ -97,7 +97,7 @@ build_macos_intel:
   extends: .test_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
 
 
 .test_macos_intel_template:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 513526189a495931556c29cf53608b4599252f34..0945fef83991f30aab7e067dcfcffe77c94a9e7b 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -52,7 +52,7 @@ stages:
   extends: .build_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
   artifacts:
     paths:
       - ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -127,7 +127,7 @@ build_linux_38:
   extends: .test_template
   tags:
     - docker
-  image: quay.io/condaforge/linux-anvil-cos7-x86_64
+  image: quay.io/condaforge/linux-anvil-comp7
 
 
 .test_macos_intel_template: