diff --git a/.github/workflows/mmctl-test-template.yml b/.github/workflows/mmctl-test-template.yml
index 8a9ebb92c4..7b42864cfc 100644
--- a/.github/workflows/mmctl-test-template.yml
+++ b/.github/workflows/mmctl-test-template.yml
@@ -19,7 +19,7 @@ env:
 jobs:
   test:
     name: ${{ inputs.name }}
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     env:
       COMPOSE_PROJECT_NAME: ghactions
       BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7
@@ -49,7 +49,7 @@ jobs:
       - name: Run mmctl Tests
         run: |
           if [[ ${{ github.ref_name }} == 'master' ]]; then
-            export TESTFLAGS="-timeout 30m -race"
+            export TESTFLAGS="-timeout 90m -race"
           else
             export TESTFLAGS="-timeout 30m"
           fi