diff --git a/.github/workflows/beam_Infrastructure_UsersPermissions.yml b/.github/workflows/beam_Infrastructure_UsersPermissions.yml
index b188e5ff875b..fb2fb67fba8d 100644
--- a/.github/workflows/beam_Infrastructure_UsersPermissions.yml
+++ b/.github/workflows/beam_Infrastructure_UsersPermissions.yml
@@ -23,16 +23,9 @@
 name: Modify the GCP User Roles according to the infra/users.yml file
 
 on:
-  workflow_dispatch:
-  pull_request_target:
-    types: [opened, synchronize, reopened, closed]
-    paths:
-      - 'infra/iam/users.yml'
-
-# This allows a subsequently queued workflow run to interrupt previous runs
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login }}'
-  cancel-in-progress: true
+  workflow_run:
+    workflows: ["Extract users.yml from PR"]
+    types: [completed]
 
 permissions:
   contents: read
@@ -43,32 +36,50 @@ jobs:
     name: Apply user roles changes
     runs-on: [self-hosted, ubuntu-24.04, main]
     timeout-minutes: 30
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - name: Checkout code
+      - name: Checkout trusted base repository
         uses: actions/checkout@v7
         with:
-          ref: ${{ github.event.pull_request.merged == true && github.base_ref || github.event.pull_request.head.sha }}
           persist-credentials: false
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: pr-data
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      # Move the users.yml file to the correct location for Terraform to process it
+      - name: Prepare users.yml
+        run: mv users.yml infra/iam/users.yml
+
+      - name: Load PR Number
+        run: |
+          PR_NUM=$(cat pr_number.txt)
+          echo "PR_NUMBER=$PR_NUM" >> $GITHUB_ENV
+
       - name: Setup gcloud
         uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
+
       - name: Install Terraform
-        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
+        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e
         with:
           terraform_version: 1.12.2
+
       - name: Initialize Terraform
         working-directory: ./infra/iam
         run: terraform init
+
       - name: Terraform Plan
         working-directory: ./infra/iam
         run: terraform plan -out=tfplan
 
       - name: Convert plan to plaintext
-        if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.action == 'reopened'
         working-directory: ./infra/iam
         run: terraform show -no-color tfplan > tfplan.txt
 
       - name: Create comment body
-        if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.action == 'reopened'
         run: |
           PLAN_SIZE=$(wc -c < ./infra/iam/tfplan.txt)
           if [ "$PLAN_SIZE" -gt 60000 ]; then
@@ -81,14 +92,9 @@ jobs:
             echo '```' >> comment_body.txt
           fi
 
+      # Use the environment variable PR_NUMBER that we read from the file
       - name: Upload plan as a comment to PR
-        if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.action == 'reopened'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
-        run: gh pr comment ${{ github.event.pull_request.number }} --body-file comment_body.txt
-
-      - name: Terraform Apply
-        if: github.event.pull_request.merged == true
-        working-directory: ./infra/iam
-        run: terraform apply -auto-approve tfplan
+        run: gh pr comment "$PR_NUMBER" --body-file comment_body.txt
diff --git a/.github/workflows/beam_infraestructure_extract_users.yml b/.github/workflows/beam_infraestructure_extract_users.yml
new file mode 100644
index 000000000000..630993047252
--- /dev/null
+++ b/.github/workflows/beam_infraestructure_extract_users.yml
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow is used to extract the users.yml file from a pull request and upload it
+# as an artifact for further processing.
+# It is triggered when the users.yml file is modified in a pull request.
+
+
+name: Extract users.yml from PR
+
+on:
+  pull_request:
+    paths:
+      - 'infra/iam/users.yml'
+
+jobs:
+  extract_data:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout PR code
+        uses: actions/checkout@v7
+
+      # Save the PR number to a file for later use
+      - name: Save PR number
+        run: echo ${{ github.event.pull_request.number }} > pr_number.txt
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: pr-data
+          path: |
+            infra/iam/users.yml
+            pr_number.txt
\ No newline at end of file
diff --git a/infra/iam/users.yml b/infra/iam/users.yml
index 6c37b4c1fef0..495a831e73cf 100644
--- a/infra/iam/users.yml
+++ b/infra/iam/users.yml
@@ -448,6 +448,11 @@
   - role: roles/eventarc.eventReceiver
   - role: roles/pubsub.publisher
   - role: roles/workflows.invoker
+- username: finops_test_user
+  email: finops.test.user@gmail.com
+  member_type: user
+  permissions:
+  - role: roles/beam_viewer
 - username: firebase-adminsdk-dpfsw
   email: firebase-adminsdk-dpfsw@apache-beam-testing.iam.gserviceaccount.com
   member_type: serviceAccount