diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index fe81ce40..4185e787 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -10,7 +10,7 @@ jobs:
     name: Build and test pull request
     runs-on: ubuntu-latest
     env:
-      RIOT_BRANCH: 2020.10-branch
+      RIOT_BRANCH: '2020.10'
 
     steps:
       - name: checkout
@@ -102,7 +102,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: RIOT-OS/RIOT
-          ref: ${{ env.RIOT_BRANCH }}
+          ref: ${{ env.RIOT_BRANCH }}-branch
           path: RIOT
 
       - name: Run gnu build test
@@ -125,5 +125,5 @@ jobs:
       - name: Run static tests
         run: |
           docker run --rm -t -v $(pwd)/RIOT:/data/riotbuild \
-          -e CI_BASE_BRANCH=${{ env.RIOT_BRANCH }} ${{ secrets.DOCKERHUB_USERNAME }}/riotbuild:latest \
+          -e CI_BASE_BRANCH=${{ env.RIOT_BRANCH }}-branch ${{ secrets.DOCKERHUB_USERNAME }}/riotbuild:latest \
           ./dist/tools/ci/static_tests.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13672267..b681ac0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build and push images
     runs-on: ubuntu-latest
     env:
-      RIOT_BRANCH: 2020.10-branch
+      RIOT_BRANCH: '2021.01'
 
     steps:
       - name: checkout
@@ -40,7 +40,9 @@ jobs:
           platforms: linux/amd64
           pull: true
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/riotdocker-base:latest
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/riotdocker-base:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/riotdocker-base:${{ env.RIOT_BRANCH }}
           cache-from: type=local,src=/tmp/.buildx-cache-base
           cache-to: type=local,dest=/tmp/.buildx-cache-base-new
 
@@ -66,7 +68,9 @@ jobs:
           platforms: linux/amd64
           pull: true
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/static-test-tools:latest
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/static-test-tools:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/static-test-tools:${{ env.RIOT_BRANCH }}
           build-args: |
             DOCKERHUB_REGISTRY=${{ secrets.DOCKERHUB_USERNAME }}
           cache-from: type=local,src=/tmp/.buildx-cache-static
@@ -94,7 +98,9 @@ jobs:
           platforms: linux/amd64
           pull: true
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/riotbuild:latest
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/riotbuild:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/riotbuild:${{ env.RIOT_BRANCH }}
           build-args: |
             DOCKERHUB_REGISTRY=${{ secrets.DOCKERHUB_USERNAME }}
           cache-from: type=local,src=/tmp/.buildx-cache-riotbuild