diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index a8dbeab0d9ef3..b905449689185 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -30,36 +30,13 @@ concurrency:
 
 jobs:
   ####
-  # Test Mandrel 23.1 with JDK 21
+  # Test Quarkus main with 23_0 quayio images
   ####
-  q-main-mandrel-23_1:
-    name: "Q main M 23.1"
+  q-main-mandrel-23_0-quayio:
+    name: "Q main M 23.0 image"
     uses: graalvm/mandrel/.github/workflows/base.yml@default
     with:
-      quarkus-version: "main"
-      version: "mandrel/23.1"
-      jdk: "21/ea"
-      issue-number: "563"
-      issue-repo: "graalvm/mandrel"
-      mandrel-it-issue-number: "198"
-      build-stats-tag: "gha-linux-qmain-m23_1-jdk21ea"
-    secrets:
-      ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}
-      UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
-  q-main-mandrel-23_1-win:
-    name: "Q main M 23.1 windows"
-    uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
-    with:
-      quarkus-version: "main"
-      version: "mandrel/23.1"
-      jdk: "21/ea"
-      issue-number: "562"
-      issue-repo: "graalvm/mandrel"
-      mandrel-it-issue-number: "199"
-      build-stats-tag: "gha-win-qmain-m23_1-jdk21ea"
-    secrets:
-      ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}
-      UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
+      builder-image: "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17"
   ####
   # Test Quarkus 3.2 with 23_0 quayio images
   ####
@@ -78,9 +55,3 @@ jobs:
     with:
       quarkus-version: "2.13.8.Final"
       builder-image: "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17"
-  q-main-mandrel-22_3-quayio:
-    name: "Q main M 22.3 image"
-    uses: graalvm/mandrel/.github/workflows/base.yml@default
-    with:
-      quarkus-version: "main"
-      builder-image: "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17"