diff --git a/.github/workflows/build-images-ci.yml b/.github/workflows/build-images-ci.yml
index 71a655f27e6..e0784e84afd 100644
--- a/.github/workflows/build-images-ci.yml
+++ b/.github/workflows/build-images-ci.yml
@@ -11,6 +11,7 @@ on:
   push:
     branches:
       - main
+      - test*
     paths-ignore:
       - 'docs/**'
 
@@ -97,7 +98,7 @@ jobs:
 
       # main branch pushes
       - name: CI Build (main)
-        if: github.event_name == 'push'
+        if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         id: docker_build_ci_main
         with:
@@ -112,6 +113,22 @@ jobs:
             quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}
             quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:latest
 
+      # non-main branch pushes
+      - name: CI Build (non-main)
+        if: ${{ github.event_name == 'push' && github.ref_name != 'main' }}
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        id: docker_build_ci_main
+        with:
+          provenance: false
+          context: .
+          file: ${{ matrix.dockerfile }}
+          push: true
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            TETRAGON_VERSION=${{ env.TETRAGON_VERSION }}
+          tags: |
+            quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}
+
       - name: Sign Container Image
         if: github.event_name == 'push'
         env: