diff --git a/.github/workflows/fb-e2e-suite.yml b/.github/workflows/fb-e2e-suite.yml
index c0d988fb..251295c5 100644
--- a/.github/workflows/fb-e2e-suite.yml
+++ b/.github/workflows/fb-e2e-suite.yml
@@ -86,8 +86,8 @@ jobs:
 #      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
 #      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
 #      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
-#      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-#      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+#      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+#      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
 #      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
 #      setup_services: '--mongo-replica-for-backup --setup-bm-mysql'
 #      tags_for_tests: '@bm-mysql'
@@ -191,18 +191,6 @@ jobs:
       setup_services: '--database pgsql'
       tags_for_tests: '@pgss-pmm-integration'
 
-  rbac:
-    name: RBAC UI tests
-    uses: ./.github/workflows/runner-e2e-tests-playwright.yml
-    secrets: inherit
-    with:
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3 '}}
-      pmm_test_flag: '@rbac'
-      pmm_server_version: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
-      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
-      setup_services: '--database ps --database psmdb'
-      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
-
 # Unskip once it will be possible to find ARBITER element on the replset summary dashboard
   # psmdb_arbiter:
   #   name: PSMDB Arbiter Replica UI tests
@@ -223,11 +211,11 @@ jobs:
     uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml
     secrets: inherit
     with:
-      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
-      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
-      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
-      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       setup_services: '--database psmdb,SETUP_TYPE=pss'
       tags_for_tests: '@pmm-psmdb-replica-integration'
@@ -294,11 +282,26 @@ jobs:
     uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml
     secrets: inherit
     with:
-      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
-      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
-      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
-      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       setup_services: '--database ps=8.0,QUERY_SOURCE=slowlog'
       tags_for_tests: '@fb-pmm-ps-integration'
+
+  rbac:
+    name: PS UI Role based access control
+    uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml
+    secrets: inherit
+    with:
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3
+      ' }}
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      setup_services: '--database ps --database pdpgsql'
+      tags_for_tests: '@rbac'
diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml
index 04aaab4f..081b1d77 100644
--- a/.github/workflows/runner-e2e-tests-codeceptjs.yml
+++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml
@@ -156,7 +156,7 @@ jobs:
         working-directory: pmm-ui-tests
         run: |
           npm ci
-          npx playwright install
+          npx playwright install --with-deps
           envsubst < env.list > env.generated.list
 
       - name: Execute e2e tests with tags ${{ env.TAGS_FOR_TESTS }}