diff --git a/.github/workflows/project-codeflare-release.yml b/.github/workflows/project-codeflare-release.yml
index 93f7b6e07..dbe317bd0 100644
--- a/.github/workflows/project-codeflare-release.yml
+++ b/.github/workflows/project-codeflare-release.yml
@@ -22,6 +22,14 @@ on:
       kueue-version:
         description: 'Tested version of Kueue (for example: v0.0.0)'
         required: true
+      cert-generator-image:
+        description: 'Image used to generate RayCluster certificates'
+        required: true
+        default: 'registry.redhat.io/ubi9:latest'
+      oauth-proxy-image:
+        description: 'Image used to run OAuth proxy'
+        required: true
+        default: 'registry.redhat.io/openshift4/ose-oauth-proxy:latest'
       is-stable:
         description: 'Select if the built images should be tagged as stable'
         required: true
@@ -98,7 +106,20 @@ jobs:
     steps:
     - name: Release CodeFlare operator
       run: |
-        gh workflow run tag-and-build.yml --repo ${{ github.event.inputs.codeflare-repository-organization }}/codeflare-operator --ref ${{ github.ref }} --field is-stable=${{ github.event.inputs.is-stable }} --field version=${{ github.event.inputs.operator-version }} --field replaces=${{ github.event.inputs.replaces }} --field codeflare-sdk-version=${{ github.event.inputs.codeflare-sdk-version }} --field appwrapper-version=${{ github.event.inputs.appwrapper-version }} --field kuberay-version=${{ github.event.inputs.kuberay-version }} --field kueue-version=${{ github.event.inputs.kueue-version }} --field quay-organization=${{ github.event.inputs.quay-organization }} --field community-operators-prod-fork-organization=${{ github.event.inputs.codeflare-repository-organization }} --field community-operators-prod-organization=${{ github.event.inputs.community-operators-prod-organization }}
+        gh workflow run tag-and-build.yml --repo ${{ github.event.inputs.codeflare-repository-organization }}/codeflare-operator \
+        --ref ${{ github.ref }} \
+        --field is-stable=${{ github.event.inputs.is-stable }} \
+        --field version=${{ github.event.inputs.operator-version }} \
+        --field replaces=${{ github.event.inputs.replaces }} \
+        --field codeflare-sdk-version=${{ github.event.inputs.codeflare-sdk-version }} \
+        --field appwrapper-version=${{ github.event.inputs.appwrapper-version }} \
+        --field kuberay-version=${{ github.event.inputs.kuberay-version }} \
+        --field kueue-version=${{ github.event.inputs.kueue-version }} \
+        --field quay-organization=${{ github.event.inputs.quay-organization }} \
+        --field community-operators-prod-fork-organization=${{ github.event.inputs.codeflare-repository-organization }} \
+        --field community-operators-prod-organization=${{ github.event.inputs.community-operators-prod-organization }} \
+        --field cert-generator-image=${{ github.event.inputs.cert-generator-image }} \
+        --field oauth-proxy-image=${{ github.event.inputs.oauth-proxy-image }}
       env:
         GITHUB_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
       shell: bash
diff --git a/.github/workflows/tag-and-build.yml b/.github/workflows/tag-and-build.yml
index 3b3f4a8e4..3e438d6a7 100644
--- a/.github/workflows/tag-and-build.yml
+++ b/.github/workflows/tag-and-build.yml
@@ -28,6 +28,14 @@ on:
         description: 'Tested version of Kueue'
         required: true
         default: 'v0.0.0-dev'
+      cert-generator-image:
+        description: 'Image used to generate RayCluster certificates'
+        required: true
+        default: 'registry.redhat.io/ubi9:latest'
+      oauth-proxy-image:
+        description: 'Image used to run OAuth proxy'
+        required: true
+        default: 'registry.redhat.io/openshift4/ose-oauth-proxy:latest'
       is-stable:
         description: 'Select if the built image should be tagged as stable'
         required: true
@@ -124,7 +132,10 @@ jobs:
     - name: Image Build and Push
       run: |
         make build
-        make image-build -e IMG=quay.io/${{ github.event.inputs.quay-organization }}/codeflare-operator:${{ github.event.inputs.version }}
+        make image-build \
+          -e IMG=quay.io/${{ github.event.inputs.quay-organization }}/codeflare-operator:${{ github.event.inputs.version }} \
+          -e CERT_GENERATOR_IMAGE=${{ github.event.inputs.cert-generator-image }} \
+          -e OAUTH_PROXY_IMAGE=${{ github.event.inputs.oauth-proxy-image }}
         make image-push -e IMG=quay.io/${{ github.event.inputs.quay-organization }}/codeflare-operator:${{ github.event.inputs.version }}
 
     - name: Image Push as stable tag