diff --git a/.github/workflows/build-test-image.yml b/.github/workflows/build-test-image.yml
index a7593b33f..cce49b020 100644
--- a/.github/workflows/build-test-image.yml
+++ b/.github/workflows/build-test-image.yml
@@ -13,9 +13,11 @@ jobs:
     strategy:
       matrix:
         keycloak-version:
-          - '21.0.1'
-          - '20.0.5'
-          - '19.0.2'
+          - '25.0.2'
+          - '24.0.5'
+          - '23.0.7'
+          - '22.0.5'
+          - '21.1.2'
       fail-fast: false
     concurrency:
       group: docker-build-${{ matrix.keycloak-version }}
@@ -27,17 +29,17 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#      - name: Login to Docker Hub
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          push: true
-          tags: mrparkers/keycloak-dev:${{ matrix.keycloak-version }}
+          push: false
+          tags: keycloak-dev:${{ matrix.keycloak-version }}
           file: test/Dockerfile
           build-args: |
             KEYCLOAK_VERSION=${{ matrix.keycloak-version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e4fce6bfc..6b0e8e7fc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,9 +60,11 @@ jobs:
     strategy:
       matrix:
         keycloak-version:
-          - '21.0.1'
-          - '20.0.5'
-          - '19.0.2'
+          - '25.0.2'
+          - '24.0.5'
+          - '23.0.7'
+          - '22.0.5'
+          - '21.1.2'
       fail-fast: false
     concurrency:
       group: ${{ github.head_ref || github.run_id }}-${{ matrix.keycloak-version }}