diff --git a/.github/workflows/fork-ci.yaml b/.github/workflows/fork-ci.yaml
index a84bc0039..537a93a8c 100644
--- a/.github/workflows/fork-ci.yaml
+++ b/.github/workflows/fork-ci.yaml
@@ -1,37 +1,37 @@
 name: Fork Docker CI
 
-# on:
-#   push:
-#     branches:
-#     - network-operator-*
-#     tags:
-#     - network-operator-*
+on:
+  push:
+    branches:
+      - network-operator-*
+    tags:
+      - network-operator-*
 
 jobs:
   determine_docker_registry_and_tag:
     runs-on: ubuntu-latest
     env:
       REGISTRY_INTERNAL: nvcr.io/nvstaging/mellanox
-      REGISTRY_PUBLIC: nvcr.io/nvidia/cloud-native
+      REGISTRY_PUBLIC: nvcr.io/nvidia/mellanox
     steps:
-    - uses: actions/checkout@v4
-      with:
-        sparse-checkout: .
-    - if: github.ref_type == 'branch'
-      name: Determine docker registry and tag (when git branch)
-      run: |
-        echo DOCKER_REGISTRY=$REGISTRY_INTERNAL >> $GITHUB_ENV
-        echo DOCKER_TAG=$(git rev-parse --short HEAD) >> $GITHUB_ENV  # short git commit hash
-    - if: github.ref_type == 'tag'
-      name: Determine docker registry and tag (when git tag)
-      run: |
-        echo DOCKER_REGISTRY=$(echo ${{ github.ref_name }} | sed 's/network-operator-//' | grep -q '-' && echo $REGISTRY_INTERNAL || echo $REGISTRY_PUBLIC) >> $GITHUB_ENV  # use public registry only when release tag has no '-beta*' or '-rc*' suffix
-        echo DOCKER_TAG=${{ github.ref_name }} >> $GITHUB_ENV
-    - name: Store docker registry and tag for following jobs
-      id: store-docker-registry-and-tag
-      run: |
-        echo DOCKER_REGISTRY=$DOCKER_REGISTRY >> $GITHUB_OUTPUT
-        echo DOCKER_TAG=$DOCKER_TAG >> $GITHUB_OUTPUT
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: .
+      - if: github.ref_type == 'branch'
+        name: Determine docker registry and tag (when git branch)
+        run: |
+          echo DOCKER_REGISTRY=$REGISTRY_INTERNAL >> $GITHUB_ENV
+          echo DOCKER_TAG=$(git rev-parse --short HEAD) >> $GITHUB_ENV  # short git commit hash
+      - if: github.ref_type == 'tag'
+        name: Determine docker registry and tag (when git tag)
+        run: |
+          echo DOCKER_REGISTRY=$(echo ${{ github.ref_name }} | sed 's/network-operator-//' | grep -q '-' && echo $REGISTRY_INTERNAL || echo $REGISTRY_PUBLIC) >> $GITHUB_ENV  # use public registry only when release tag has no '-beta*' or '-rc*' suffix
+          echo DOCKER_TAG=${{ github.ref_name }} >> $GITHUB_ENV
+      - name: Store docker registry and tag for following jobs
+        id: store-docker-registry-and-tag
+        run: |
+          echo DOCKER_REGISTRY=$DOCKER_REGISTRY >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$DOCKER_TAG >> $GITHUB_OUTPUT
     outputs:
       docker_registry: ${{ steps.store-docker-registry-and-tag.outputs.DOCKER_REGISTRY }}
       docker_tag: ${{ steps.store-docker-registry-and-tag.outputs.DOCKER_TAG }}
@@ -74,34 +74,38 @@ jobs:
 
   update_network_operator_values:
     needs:
-    - determine_docker_registry_and_tag
-    - build_and_push_images
+      - determine_docker_registry_and_tag
+      - build_and_push_images
     runs-on: ubuntu-latest
     env:
+      DOCKER_REGISTRY: ${{ needs.determine_docker_registry_and_tag.outputs.docker_registry }}
       DOCKER_TAG: ${{ needs.determine_docker_registry_and_tag.outputs.docker_tag }}
       GH_TOKEN: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
     steps:
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
-        repository: ${{ github.repository_owner }}/network-operator
-    - name: Create PR to update image tags in network-operator values
-      run: |
-        git config user.name  nvidia-ci-cd
-        git config user.email svc-cloud-orch-gh@nvidia.com
-
-        git checkout -b feature/update-sriov-tags-to-$DOCKER_TAG
-        sed -Ei "s/(version: )network-operator-.+/\\1$DOCKER_TAG/g" hack/release.yaml
-        make release-build
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
+          repository: ${{ github.repository_owner }}/network-operator
+      - name: Determine base branch
+        run: |
+          echo "BASE_BRANCH=${{ contains(env.DOCKER_TAG, 'beta') && 'master' || env.DOCKER_TAG }}" >> $GITHUB_ENV
+      - name: Create PR to update image tags in network-operator values
+        run: |
+          git config user.name  nvidia-ci-cd
+          git config user.email svc-cloud-orch-gh@nvidia.com
+          
+          git checkout -b feature/update-sriov-tags-to-$DOCKER_TAG
+          yq -i e '.SriovNetworkOperator.repository |= "${{ env.DOCKER_REGISTRY }}"' hack/release.yaml
+          yq -i e '.SriovNetworkOperator.version |= "${{ env.DOCKER_TAG }}"' hack/release.yaml
+          make release-build
 
-        if ! git diff --color --unified=0 --exit-code; then
-          git commit -sam "task: update SR-IOV images tags to $DOCKER_TAG in chart values"
-          git push -u origin feature/update-sriov-tags-to-$DOCKER_TAG
-          gh pr create \
-            --repo ${{ github.repository_owner }}/network-operator \
-            --base master \
-            --head $(git branch --show-current) \
-            --fill \
-            --body "Created by the *${{ github.job }}* job in [${{ github.repository }} CI](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})."
-        fi
-      # TODO: double check with ivan about freddy's question: should we push to master or to a release branch?
+          if ! git diff --color --unified=0 --exit-code; then
+            git commit -sam "task: update SR-IOV images tags to $DOCKER_TAG in chart values"
+            git push -u origin feature/update-sriov-tags-to-$DOCKER_TAG
+            gh pr create \
+              --repo ${{ github.repository_owner }}/network-operator \
+              --base $BASE_BRANCH \
+              --head $(git branch --show-current) \
+              --fill \
+              --body "Created by the *${{ github.job }}* job in [${{ github.repository }} CI](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})."
+          fi