diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
index 4bb3622..358516c 100644
--- a/.github/workflows/build-test-images.yml
+++ b/.github/workflows/build-test-images.yml
@@ -22,7 +22,7 @@ jobs:
   build_dev_images_per_postgres:
     if: github.ref_name != 'master'
     name: push-test-images-for-dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs:
       - prepare_pgversion_matrix
     strategy:
@@ -38,23 +38,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: list buildx version
-        run: |
-          docker buildx version
-          docker buildx ls
-          docker buildx inspect
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: v0.15.1
-
-      - name: list buildx version (again)
-        run: |
-          docker buildx version
-          docker buildx ls
-          docker buildx inspect
-
       - name: 'Login to GitHub Container Registry'
         uses: docker/login-action@v3
         with:
@@ -66,12 +49,12 @@ jobs:
       - name: Build & Push all dev images
         run: |
           cd circleci/images
-          BUILDX_BUILDER=${{ steps.buildx.outputs.name }} make push-${{ matrix.command }}-${{ matrix.pgversion }}
+          make push-${{ matrix.command }}-${{ matrix.pgversion }}
 
   build_dev_images_shared:
     if: github.ref_name != 'master'
     name: push-test-images-for-dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -84,24 +67,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: list buildx version
-        run: |
-          docker buildx version
-          docker buildx ls
-          docker buildx inspect
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        id: buildx
-        with:
-          version: v0.15.1
-
-      - name: list buildx version (again)
-        run: |
-          docker buildx version
-          docker buildx ls
-          docker buildx inspect
-
       - name: 'Login to GitHub Container Registry'
         uses: docker/login-action@v3
         with:
@@ -113,7 +78,7 @@ jobs:
       - name: Build & Push all dev images
         run: |
           cd circleci/images
-          BUILDX_BUILDER=${{ steps.buildx.outputs.name }} make push-${{ matrix.command }}-all
+          make push-${{ matrix.command }}-all
 
 
   build_release_images: