diff --git a/.github/workflows/build_3.1.x.yml b/.github/workflows/build_3.1.x.yml
deleted file mode 100644
index 12faa106..00000000
--- a/.github/workflows/build_3.1.x.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: build_3.1.x
-
-on:
-  push:
-    branches: [ 3.1.x ]
-
-jobs:
-  build:
-
-    strategy:
-      fail-fast: false
-
-    runs-on: ubuntu-latest
-    container: materialstheory/solid_dmft_ci:3.1.x
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          path: 'solid_dmft.src'
-
-      - name: Build solid_dmft
-        run: |
-          mkdir solid_dmft.build && cd solid_dmft.build && cmake ../solid_dmft.src -DMPIEXEC_PREFLAGS='--allow-run-as-root'
-          make
-
-      - name: Test solid_dmft
-        run: |
-          cd solid_dmft.build
-          ctest --output-on-failure
-
diff --git a/.github/workflows/build_PR.yml b/.github/workflows/build_PR.yml
index 0a3c509b..9d2ac5ec 100644
--- a/.github/workflows/build_PR.yml
+++ b/.github/workflows/build_PR.yml
@@ -1,4 +1,4 @@
-name: build_PR
+name: build PR
 
 on:
   pull_request:
diff --git a/.github/workflows/build_3.2.x.yml b/.github/workflows/build_release.yml
similarity index 82%
rename from .github/workflows/build_3.2.x.yml
rename to .github/workflows/build_release.yml
index 98bf9956..dd907f6c 100644
--- a/.github/workflows/build_3.2.x.yml
+++ b/.github/workflows/build_release.yml
@@ -1,8 +1,8 @@
-name: build_3.2.x
+name: build release
 
 on:
   push:
-    branches: [ 3.2.x ]
+    branches: [ '[0-9]+.[0-9]+.x' ]
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 2
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/triqs/solid_dmft_github_ci:3.2.x
+      image: ghcr.io/triqs/solid_dmft_github_ci:${{github.ref_name}}
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
deleted file mode 100644
index 6975a548..00000000
--- a/.github/workflows/build_stable.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: build_3.3.x
-
-on:
-  push:
-    branches: [ 3.3.x ]
-
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  CTEST_PARALLEL_LEVEL: 1
-  CTEST_OUTPUT_ON_FAILURE: 1
-  OMPI_ALLOW_RUN_AS_ROOT: 1
-  OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-  OMPI_MCA_rmaps_base_oversubscribe: "yes"
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-
-    strategy:
-      fail-fast: false
-
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/triqs/solid_dmft_github_ci:3.3.x
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build solid_dmft
-        run: |
-          cmake -S . -B build/
-          cmake --build build/ --verbose
-
-      - name: Test solid_dmft
-        run: |
-          cmake --build build/ --target test
-
diff --git a/.github/workflows/build.yml b/.github/workflows/build_unstable_doc.yml
similarity index 90%
rename from .github/workflows/build.yml
rename to .github/workflows/build_unstable_doc.yml
index 40930a36..cf75225c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build_unstable_doc.yml
@@ -1,4 +1,4 @@
-name: build
+name: build unstable & doc
 
 on:
   push:
@@ -23,7 +23,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/triqs/solid_dmft_github_ci:unstable
+      image: ghcr.io/triqs/solid_dmft_github_ci:${{github.ref_name}}
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e58adb00..4938ba41 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,9 +1,9 @@
 name: Create and publish Docker images
 
 on:
-  push: { branches: [ unstable ] }
+  push: { branches: [ unstable, '[0-9]+.[0-9]+.x' ] }
   pull_request:
-    branches: [ unstable ]
+    branches: [ unstable, '[0-9]+.[0-9]+.x' ]
     paths: ['Docker/**']
   workflow_call:
   workflow_dispatch:
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
index 58dbafcd..09100487 100644
--- a/.github/workflows/publish-to-pypi.yml
+++ b/.github/workflows/publish-to-pypi.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build distribution 📦
     runs-on: ubuntu-latest
     container:   # we have to provide a working triqs installation to make the cmake step work
-      image: ghcr.io/triqs/solid_dmft_github_ci:3.3.x
+      image: ghcr.io/triqs/solid_dmft_github_ci:${{github.ref_name}}
 
     steps:
     - uses: actions/checkout@v4