diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
index f1a0e462fa..34e1a416ba 100644
--- a/.github/actions/docker-build/action.yaml
+++ b/.github/actions/docker-build/action.yaml
@@ -68,7 +68,9 @@ runs:
       id: determine_platforms
       run: |
         if [ "${TARGET_PLATFORMS}" = "" ]; then
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          if [[ "$GITHUB_REF" =~ ^refs/heads/main$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/master$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/release.* ]] || [[ "${PRIMARY_TAG}" == "nightly" ]]; then
+            platforms=`make docker/platforms`
+          elif [ "${{ github.event_name }}" = "pull_request" ]; then
             platforms="linux/amd64"
           elif [ "${{ github.event_name }}" = "pull_request_target" ]; then
             platforms="linux/amd64"
diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
index 64ab26c470..f786cc5bce 100644
--- a/.github/workflows/dockers-agent-ngt-image.yml
+++ b/.github/workflows/dockers-agent-ngt-image.yml
@@ -80,5 +80,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent-ngt
-      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml
index d86c454edc..52abd5addc 100644
--- a/.github/workflows/dockers-benchmark-job-image.yml
+++ b/.github/workflows/dockers-benchmark-job-image.yml
@@ -78,5 +78,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: benchmark-job
-      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml
index 1c9aba0616..1050a6e56b 100644
--- a/.github/workflows/dockers-helm-operator-image.yml
+++ b/.github/workflows/dockers-helm-operator-image.yml
@@ -68,5 +68,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: operator/helm
-      platforms: linux/amd64,linux/arm64
     secrets: inherit