diff --git a/.github/workflows/ui-workflow.yaml b/.github/workflows/ui-workflow.yaml
index 0ee2b3c5..fdf49078 100644
--- a/.github/workflows/ui-workflow.yaml
+++ b/.github/workflows/ui-workflow.yaml
@@ -65,13 +65,32 @@ jobs:
         yarn build
         yarn start &
 
-    - name: Run Cypress Tests
+    - name: Run RBAC Cypress Tests
       uses: cypress-io/github-action@v6
       with:
         config-file: ./cypress/cypress.config.ts
         auto-cancel-after-failures: 1
         wait-on: 'http://localhost:3000'
-        command: yarn cypress:runAll
+        command: yarn cypress:runRbac
+      continue-on-error: true
+
+    - name: Run General Cypress Tests
+      uses: cypress-io/github-action@v6
+      with:
+        config-file: ./cypress/cypress.config.ts
+        auto-cancel-after-failures: 1
+        wait-on: 'http://localhost:3000'
+        command: yarn cypress:runGeneral
+      continue-on-error: true
+
+    - name: Run Organization Cypress Tests
+      uses: cypress-io/github-action@v6
+      with:
+        config-file: ./cypress/cypress.config.ts
+        auto-cancel-after-failures: 1
+        wait-on: 'http://localhost:3000'
+        command: yarn cypress:runOrganizations
+      continue-on-error: true
 
     - name: Stop Docker containers
       run: |