diff --git a/.github/workflows/feature-branch-image.yml b/.github/workflows/feature-branch-image.yml
index 2f79ed3cc31..8dc7d10599e 100644
--- a/.github/workflows/feature-branch-image.yml
+++ b/.github/workflows/feature-branch-image.yml
@@ -1,14 +1,14 @@
 ---
-name: Build Feature Branch Image
+name: Build and Push Feature Branch Custom Catalog
 env:
   BRANCH_NAME: ${{ github.head_ref }}
 on:
   pull_request:
-  push:
     branches:
-      - feature-*
+      - 'feature-**'
+  workflow_dispatch:
 jobs:
-  push-feature-image:
+  build-and-push-feature-branch-custom-catalog:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     permissions:
@@ -20,4 +20,19 @@ jobs:
           podman login -u ${{ secrets.QUAY_ID }} -p ${{ secrets.QUAY_TOKEN }} quay.io
       - name: Build and Push Feature Branch Image
         run: |
-          make image -e IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator:${{ env.BRANCH_NAME }}
\ No newline at end of file
+          make image -e IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator:${{ env.BRANCH_NAME }}
+      - name: Build Bundle Manifests
+        run: |
+          make bundle
+      - name: Build Feature Branch Bundle
+        run: |
+          make bundle-build -e BUNDLE_IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator-bundle:${{ env.BRANCH_NAME }}
+      - name: Push Feature Branch Bundle to quay.io
+        run: |
+          make bundle-push -e BUNDLE_IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator-bundle:${{ env.BRANCH_NAME }}
+      - name: Build Feature Branch Catalog
+        run: |
+          make catalog-build -e CATALOG_IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator-catalog:${{ env.BRANCH_NAME }} -e BUNDLE_IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator-bundle:${{ env.BRANCH_NAME }}
+      - name: Push Feature Branch Catalog to quay.io
+        run: |
+          make catalog-push -e CATALOG_IMG=quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator-catalog:${{ env.BRANCH_NAME }}
\ No newline at end of file