diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00f9f402..ddcb850e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ on:
       - v[0-9]+
       - v[0-9]+.[0-9]+
       - cryostat-v[0-9]+.[0-9]+
-      - cryostat3
+      - cryostat3-v[0-9]+.[0-9]+
 
 jobs:
   check-before-build:
@@ -111,7 +111,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['17', '21']
+        arch: [amd64, arm64]
+        java: ['17']
     env:
         cache-name: cache-yarn
     name: Build Java ${{ matrix.java }}
@@ -176,8 +177,18 @@ jobs:
     - name: Set DOCKER_HOST environment variable
       run: echo "DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock" >> "$GITHUB_ENV"
     - name: Build cryostat3
-      run: ./mvnw -B -U -Dbuild.java=${{ matrix.java }} -Dio.cryostat.core.version=${{ needs.build-core.outputs.core_version }} clean package
+      run: ./mvnw -B -U -Dbuild.arch=${{ matrix.arch }} -Dio.cryostat.core.version=${{ needs.build-core.outputs.core_version }} clean package
       continue-on-error: ${{ matrix.java != '17' }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Debug podman images
+      run: podman images
+    - name: Save cryostat3 image
+      run: podman save -o cryostat3-${{ matrix.arch }}.tar --format oci-archive quay.io/cryostat/cryostat:3.0.0-snapshot
+    - uses: actions/upload-artifact@v3
+      with:
+        name: cryostat3-${{ matrix.arch }}
+        path: ${{ github.workspace }}/cryostat3-${{ matrix.arch }}.tar
 
   push-to-ghcr:
     runs-on: ubuntu-latest
@@ -191,7 +202,8 @@ jobs:
     permissions:
       packages: write
     steps:
-    - uses: actions/download-artifact@v3
+    - name: Download cryostat artifact
+      uses: actions/download-artifact@v3
       with:
         name: cryostat-${{ matrix.arch }}
     - name: Load cryostat image
@@ -216,12 +228,56 @@ jobs:
       id: arm64_image
       run: echo "image=${{ steps.push-to-ghcr.outputs.registry-path }}" >> "$GITHUB_OUTPUT"
 
+  push-cryostat3-to-ghcr:
+    runs-on: ubuntu-latest
+    needs: [build-cryostat3]
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+        java: ['17']
+    outputs:
+      cryostat3_java17_amd64_image: ${{ steps.cryostat3_java17_amd64_image.outputs.image }}
+      cryostat3_java17_arm64_image: ${{ steps.cryostat3_java17_arm64_image.outputs.image }}
+
+    permissions:
+        packages: write
+    steps:
+    - name: Download cryostat3 artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: cryostat3-${{ matrix.arch }}
+    - name: Load cryostat3 image
+      run: podman load -i cryostat3-${{ matrix.arch }}.tar
+    - name: Tag cryostat3 image
+      run: podman tag cryostat:3.0.0-snapshot ghcr.io/${{ github.repository_owner }}/cryostat-core:pr-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}-linux-${{ matrix.arch }}-java${{ matrix.java }}
+    - name: Push PR test image to ghcr.io
+      id: push-cryostat3-to-ghcr
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        image: cryostat-core
+        tags: pr-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}-linux-${{ matrix.arch }}-java${{ matrix.java }}
+        registry: ghcr.io/${{ github.repository_owner }}
+        username: ${{ github.event.pull_request.user.login }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: store cryostat3 images as output
+      if: ${{ matrix.arch == 'amd64' && matrix.java == '17' }}
+      id: cryostat3_java17_amd64_image
+      run: echo "image=${{ steps.push-cryostat3-to-ghcr.outputs.registry-path }}" >> "$GITHUB_OUTPUT"
+    - name: store cryostat3 images as output
+      if: ${{ matrix.arch == 'arm64' && matrix.java == '17' }}
+      id: cryostat3_java17_arm64_image
+      run: echo "image=${{ steps.push-cryostat3-to-ghcr.outputs.registry-path }}" >> "$GITHUB_OUTPUT"
+    
+
   comment-image:
     runs-on: ubuntu-latest
-    needs: [push-to-ghcr]
+    needs: [push-to-ghcr, push-cryostat3-to-ghcr]
     env:
       amd64_image: ${{ needs.push-to-ghcr.outputs.amd64_image }}
       arm64_image: ${{ needs.push-to-ghcr.outputs.arm64_image }}
+      cryostat3_java17_amd64_image: ${{needs.push-cryostat3-to-ghcr.outputs.cryostat3_java17_amd64_image}}
+      cryostat3_java17_arm64_image: ${{ needs.push-cryostat3-to-ghcr.outputs.cryostat3_java17_arm64_image }}
+      
     permissions:
       pull-requests: write
     steps:
@@ -233,6 +289,9 @@ jobs:
           ARCH, IMAGE
           amd64, ${{ env.amd64_image }}
           arm64, ${{ env.arm64_image }}
+          cryostat3-java17_amd64, ${{ env.cryostat3_java17_amd64_image }}
+          cryostat3-java17_arm64, ${{ env.cryostat3_java17_arm64_image }}
+
     - uses: thollander/actions-comment-pull-request@v2
       with:
         message: |-
@@ -245,4 +304,10 @@ jobs:
 
           # or arm64
           CRYOSTAT_IMAGE=${{ env.arm64_image }} sh smoketest.sh
+
+          # or cryostat3-java17-amd64
+          CRYOSTAT3_java17amd64_IMAGE=${{ env.cryostat3_java17_amd64_image }} sh smoketest.sh
+
+          # or cryostat3-java17-arm64
+          CRYOSTAT3_java17arm64_IMAGE=${{ env.cryostat3_java17_arm64_image }} sh smoketest.sh 
           ```