diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 038d2823f..d6a7a0037 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -2,12 +2,12 @@ name: Automation Tests
 
 on:
   push:
-    branches: [ feature/ui-automation ]
+    branches: [ feature/automation ]
   pull_request:
-    branches: [ feature/ui-automation ]
+    branches: [ feature/automation ]
 
 jobs:
-  install:
+  automation-tests:
 
     runs-on: ubuntu-latest
 
@@ -32,49 +32,22 @@ jobs:
     - name: Install Automation Deps
       run: yarn --cwd ./tests install
 
-  cypress-tests:
-
-    runs-on: ubuntu-latest
-    needs: install
-    strategy:
-      fail-fast: false
-      matrix:
-        # run copies of the current job in parallel
-        containers: [1, 2]
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
     - name: Start Backend
       run: |
           nohup dotnet run -p ./src/Ombi -- --host http://*:3577 &
-
     - name: Start Frontend
       run: |
-           nohup yarn --cwd ./src/Ombi/ClientApp run start:nomap &
-
+          nohup yarn --cwd ./src/Ombi/ClientApp start &
     - name: Cypress Tests
       uses: cypress-io/github-action@v2.8.2
       with:
-        install: false
         record: true
         browser: chrome
         headless: true
         working-directory: tests
-        group: "UI - Chrome"
         wait-on: http://localhost:3577/
-        parallel: true
-        # 8 minutes
-        wait-on-timeout: 1200
+        # 7 minutes
+        wait-on-timeout: 420
       env:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file