diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 9e3d1c01..7d0a721f 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -28,6 +28,9 @@ jobs:
           - name: "mandrel builder images"
             modules: "quarkus-mandrel-builder-image"
             args: ""
+          - name: "mandrel builder images 21 and 22.0"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Polder-mandrel"
           - name: "graalvm ce builder images"
             modules: "quarkus-graalvm-builder-image"
             args: ""
diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
index d625c39c..d87b736f 100644
--- a/.github/workflows/push-images.yml
+++ b/.github/workflows/push-images.yml
@@ -23,6 +23,9 @@ jobs:
           - name: "mandrel builder images"
             modules: "quarkus-mandrel-builder-image"
             args: ""
+          - name: "mandrel builder images 21 and 22.0"
+            modules: "quarkus-mandrel-builder-image"
+            args: "-Polder-mandrel"
           - name: "graalvm ce builder images"
             modules: "quarkus-graalvm-builder-image"
             args: ""
diff --git a/quarkus-mandrel-builder-image/mandrel-21-22.yaml b/quarkus-mandrel-builder-image/mandrel-21-22.yaml
new file mode 100644
index 00000000..97e3e85e
--- /dev/null
+++ b/quarkus-mandrel-builder-image/mandrel-21-22.yaml
@@ -0,0 +1,58 @@
+images:
+  - graalvm-version: 21.3.2.0-Final
+    java-version: 11
+    variants:
+      - arch: amd64
+        sha: 2d6d96b8b22ce7ec92ed00ba2dc69909c691738a16111c9c3b284b8aed7657ea
+  - graalvm-version: 21.3.2.0-Final
+    java-version: 17
+    variants:
+      - arch: amd64
+        sha: e23c0b09326ccc6836d0218b74c5382b3b5c79c80cd724ecdde34212d91fc0fc
+
+  - graalvm-version: 21.3.3.0-Final
+    java-version: 11
+    tag: 21.3-java11
+    variants:
+      - arch: amd64
+        sha: 9b722400b6ca826c5092cd276c785240145e4cc864936e3ea64bb4002a52ed31
+  - graalvm-version: 21.3.3.0-Final
+    java-version: 17
+    tag: 21.3-java17
+    variants:
+      - arch: amd64
+        sha: 8e1450e5b3a5345d66920a32b4bb4c39efa51a1b93b2e1f87fc130b95feee536
+
+  - graalvm-version: 22.0.0.2-Final
+    java-version: 11
+    tag: 22.0-java11
+    variants:
+      - sha: 57d8cc4777e513db492d8bf51521201bad0600ef95bf0afd687bf44f9bda8a87
+        arch: amd64
+      - sha: 8a382563f85282193a47b6d873d3b647c82098150f88c26a934144d2465a5f81
+        arch: arm64
+  - graalvm-version: 22.0.0.2-Final
+    java-version: 17
+    tag: 22.0-java17
+    variants:
+      - sha: 114a3d4a67bcdf090b8355ca6787d5f7da2c3763e521f47c12a91e867682ba92
+        arch: amd64
+      - sha: 40b67cacbd11dbc25f21d832ba0df0d75ef1cb68b9d028455b4b64792a1edba9
+        arch: arm64
+
+  - graalvm-version: 22.1.0.0-Final
+    java-version: 11
+    tag: 22.1-java11
+    variants:
+      - sha: 25bc444053bf5d162b932bfb68ffba40612ad0685f19edc68869fdcc0c38b0a8
+        arch: amd64
+      - sha: 932e167e0571c7eda37f20b3c2605563666e0fed79de2dcac2ad6f48cdf91d7b
+        arch: arm64
+  - graalvm-version: 22.1.0.0-Final
+    java-version: 17
+    tag: 22.1-java17
+    variants:
+      - sha: b40bf617fd957fcb7fe61acc2621d0a84931822498b83b968f704b47e1e2edaf
+        arch: amd64
+      - sha: d6c7304b3ad6a3ca17664be092a5420905b2190407b45b40ef4312f723b38208
+        arch: arm64
diff --git a/quarkus-mandrel-builder-image/mandrel.yaml b/quarkus-mandrel-builder-image/mandrel.yaml
index 77f90b48..3a64427a 100644
--- a/quarkus-mandrel-builder-image/mandrel.yaml
+++ b/quarkus-mandrel-builder-image/mandrel.yaml
@@ -1,62 +1,4 @@
 images:
-  - graalvm-version: 21.3.2.0-Final
-    java-version: 11
-    variants:
-      - arch: amd64
-        sha: 2d6d96b8b22ce7ec92ed00ba2dc69909c691738a16111c9c3b284b8aed7657ea
-  - graalvm-version: 21.3.2.0-Final
-    java-version: 17
-    variants:
-      - arch: amd64
-        sha: e23c0b09326ccc6836d0218b74c5382b3b5c79c80cd724ecdde34212d91fc0fc
-
-  - graalvm-version: 21.3.3.0-Final
-    java-version: 11
-    tag: 21.3-java11
-    variants:
-      - arch: amd64
-        sha: 9b722400b6ca826c5092cd276c785240145e4cc864936e3ea64bb4002a52ed31
-  - graalvm-version: 21.3.3.0-Final
-    java-version: 17
-    tag: 21.3-java17
-    variants:
-      - arch: amd64
-        sha: 8e1450e5b3a5345d66920a32b4bb4c39efa51a1b93b2e1f87fc130b95feee536
-
-  - graalvm-version: 22.0.0.2-Final
-    java-version: 11
-    tag: 22.0-java11
-    variants:
-      - sha: 57d8cc4777e513db492d8bf51521201bad0600ef95bf0afd687bf44f9bda8a87
-        arch: amd64
-      - sha: 8a382563f85282193a47b6d873d3b647c82098150f88c26a934144d2465a5f81
-        arch: arm64
-  - graalvm-version: 22.0.0.2-Final
-    java-version: 17
-    tag: 22.0-java17
-    variants:
-      - sha: 114a3d4a67bcdf090b8355ca6787d5f7da2c3763e521f47c12a91e867682ba92
-        arch: amd64
-      - sha: 40b67cacbd11dbc25f21d832ba0df0d75ef1cb68b9d028455b4b64792a1edba9
-        arch: arm64
-
-  - graalvm-version: 22.1.0.0-Final
-    java-version: 11
-    tag: 22.1-java11
-    variants:
-      - sha: 25bc444053bf5d162b932bfb68ffba40612ad0685f19edc68869fdcc0c38b0a8
-        arch: amd64
-      - sha: 932e167e0571c7eda37f20b3c2605563666e0fed79de2dcac2ad6f48cdf91d7b
-        arch: arm64
-  - graalvm-version: 22.1.0.0-Final
-    java-version: 17
-    tag: 22.1-java17
-    variants:
-      - sha: b40bf617fd957fcb7fe61acc2621d0a84931822498b83b968f704b47e1e2edaf
-        arch: amd64
-      - sha: d6c7304b3ad6a3ca17664be092a5420905b2190407b45b40ef4312f723b38208
-        arch: arm64
-
   - graalvm-version: 22.2.0.0-Final
     java-version: 11
     tag: 22.2-java11
@@ -72,4 +14,13 @@ images:
       - sha: b338fb26ec1ad956c8b7f890d9e978e0f580afec492a7ff8eeea78e85720c4de
         arch: amd64
       - sha: 26db51213bdea70cde576ac4011b2f504ad08056053f90e1d08a98216e594718
+        arch: arm64
+
+  - graalvm-version: 22.3.0.1-Final
+    java-version: 17
+    tag: 22.3-java17
+    variants:
+      - sha: 72ba94f4ca8e48eaa905433a6d0cfff5e7a657fb4f5419e86d7b8f5332ed0345
+        arch: amd64
+      - sha: 729ad2496191d4e0bc0dea3d19ac3ede0f4561e0ba4c3468d5824ca5a160d81b
         arch: arm64
\ No newline at end of file
diff --git a/quarkus-mandrel-builder-image/pom.xml b/quarkus-mandrel-builder-image/pom.xml
index 4b21181a..2f2c3213 100644
--- a/quarkus-mandrel-builder-image/pom.xml
+++ b/quarkus-mandrel-builder-image/pom.xml
@@ -64,6 +64,13 @@
                 <jbang.script>${project.build.sourceDirectory}/io/quarkus/images/Push.java</jbang.script>
             </properties>
         </profile>
+
+        <profile>
+            <id>older-mandrel</id>
+            <properties>
+                <images.file>${project.basedir}/mandrel-21-22.yaml</images.file>
+            </properties>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file