diff --git a/.circleci/config.yml b/.circleci/config.yml
index a87a558185..150b0c8ef0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ version: 2
 jobs:
   doc-build:
     docker:
-      - image: riot/riotbuild
+      - image: riot/static-test-tools
     steps:
       - checkout
       - run: make doc
diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml
index 1657741381..9f4c564de2 100644
--- a/.github/workflows/static-test.yml
+++ b/.github/workflows/static-test.yml
@@ -28,8 +28,8 @@ jobs:
           git config diff.renameLimit 16384
         fi
         git config apply.whitespace nowarn
-    - name: Fetch riot/riotbuild Docker image
-      run: docker pull riot/riotbuild:latest
+    - name: Fetch riot/static-test-tools Docker image
+      run: docker pull riot/static-test-tools:latest
     - name: Run static-tests
       run: |
         # Note: ${{ github.base_ref }} is empty when not in a PR
@@ -37,5 +37,5 @@ jobs:
           -e CI_BASE_BRANCH=${{ github.base_ref }}  \
           -e GITHUB_RUN_ID=${GITHUB_RUN_ID}         \
           -v $(pwd):/data/riotbuild                 \
-          riot/riotbuild:latest                     \
+          riot/static-test-tools:latest             \
           make static-test