diff --git a/.github/workflows/e2e-tests-ci.yml b/.github/workflows/e2e-tests-ci.yml
index b057e49974..588d49d91f 100644
--- a/.github/workflows/e2e-tests-ci.yml
+++ b/.github/workflows/e2e-tests-ci.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           repository_full_name: ${{ github.repository }}
           commit_sha: ${{ inputs.commit_sha || github.sha }}
-          context: ci/e2e-tests
+          context: E2E Tests/smoketests
           description: E2E tests for mattermost server app
           status: pending
 
@@ -84,7 +84,7 @@ jobs:
           npm run check
 
   smoketests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest-8-cores
     needs:
       - cypress-check
       - playwright-check
@@ -104,9 +104,9 @@ jobs:
           echo "Cypress run completed with $CYPRESS_FAILURES failures"
           [ "$CYPRESS_FAILURES" = "0" ]
 
-  update-final-status:
+  update-failure-final-status:
     runs-on: ubuntu-22.04
-    if: always()
+    if: failure() || cancelled()
     needs:
       - smoketests
     steps:
@@ -116,6 +116,22 @@ jobs:
         with:
           repository_full_name: ${{ github.repository }}
           commit_sha: ${{ inputs.commit_sha || github.sha }}
-          context: ci/e2e-tests
+          context: E2E Tests/smoketests
           description: E2E tests for mattermost server app
-          status: ${{ job.status }}
+          status: failure
+
+  update-success-final-status:
+    runs-on: ubuntu-22.04
+    if: success()
+    needs:
+      - smoketests
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ inputs.commit_sha || github.sha }}
+          context: E2E Tests/smoketests
+          description: E2E tests for mattermost server app
+          status: success
diff --git a/e2e-tests/.ci/server.override.yml b/e2e-tests/.ci/server.override.yml
index f962e8798b..dbde49f2e1 100644
--- a/e2e-tests/.ci/server.override.yml
+++ b/e2e-tests/.ci/server.override.yml
@@ -12,6 +12,7 @@ services:
     environment:
       MM_SERVICESETTINGS_SITEURL: "http://server:8065"
       MM_SERVICESETTINGS_ENABLELOCALMODE: "true"
+      MM_SERVICESETTINGS_ALLOWCORSFROM: "http://localhost:8065"
       MM_PLUGINSETTINGS_ENABLED: "true"
       MM_PLUGINSETTINGS_ENABLEUPLOADS: "true"
       MM_PLUGINSETTINGS_AUTOMATICPREPACKAGEDPLUGINS: "true"