diff --git a/.github/workflows/build-kube-ovn-base-dpdk.yaml b/.github/workflows/build-kube-ovn-base-dpdk.yaml
index 1d2a9f56043..13db1f318a7 100644
--- a/.github/workflows/build-kube-ovn-base-dpdk.yaml
+++ b/.github/workflows/build-kube-ovn-base-dpdk.yaml
@@ -26,21 +26,21 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           ref: ${{ matrix.branch }}
 
       - uses: docker/setup-buildx-action@v3
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
 
       - name: Build
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         run: |
           make base-amd64-dpdk
           make base-tar-amd64-dpdk
 
       - name: Upload image to artifact
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/upload-artifact@v3
         with:
           name: image-amd64-dpdk-${{ matrix.branch }}
@@ -61,23 +61,23 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           ref: ${{ matrix.branch }}
 
       - name: Download image
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/download-artifact@v3
         with:
           name: image-amd64-dpdk-${{ matrix.branch }}
 
       - name: Load Image
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         run: |
           docker load --input image-amd64-dpdk.tar
 
       - name: Push
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/build-kube-ovn-base.yaml b/.github/workflows/build-kube-ovn-base.yaml
index 3c7d7e15ca9..bf6aa2d9cf7 100644
--- a/.github/workflows/build-kube-ovn-base.yaml
+++ b/.github/workflows/build-kube-ovn-base.yaml
@@ -30,21 +30,21 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        if: github.event.inputs.branch == matrix.branch
+        if: (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           ref: ${{ matrix.branch }}
 
       - uses: docker/setup-buildx-action@v3
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
 
       - name: Build
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         run: |
           make base-amd64
           make base-tar-amd64
 
       - name: Upload image to artifact
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/upload-artifact@v3
         with:
           name: image-amd64-${{ matrix.branch }}
@@ -65,26 +65,26 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           ref: ${{ matrix.branch }}
 
       - uses: docker/setup-buildx-action@v3
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
 
       - uses: docker/setup-qemu-action@v3
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           platforms: arm64
 
       - name: Build
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         run: |
           make base-arm64 || make base-arm64
           make base-tar-arm64
 
       - name: Upload image to artifact
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/upload-artifact@v3
         with:
           name: image-arm64-${{ matrix.branch }}
@@ -108,30 +108,30 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         with:
           ref: ${{ matrix.branch }}
 
       - name: Download image
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/download-artifact@v3
         with:
           name: image-amd64-${{ matrix.branch }}
 
       - name: Download image
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         uses: actions/download-artifact@v3
         with:
           name: image-arm64-${{ matrix.branch }}
 
       - name: Load Image
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         run: |
           docker load --input image-amd64.tar
           docker load --input image-arm64.tar
 
       - name: Push
-        if: github.event.inputs.branch == matrix.branch
+        if:  (github.event.inputs.branch || matrix.branch) == matrix.branch
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}