diff --git a/.github/workflows/esrupgrade-common.yml b/.github/workflows/esrupgrade-common.yml
index 2faefc57ae..0c04900836 100644
--- a/.github/workflows/esrupgrade-common.yml
+++ b/.github/workflows/esrupgrade-common.yml
@@ -23,7 +23,7 @@ env:
   DIFF_NAME: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.diff
 jobs:
   esr-upgrade-server:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
       - name: Checkout mattermost project
@@ -94,7 +94,7 @@ jobs:
           name: upgraded-dump-server
           path: ${{ env.DUMP_SERVER_NAME }}.gz
   esr-upgrade-script:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
       - name: Checkout mattermost project
diff --git a/.github/workflows/server-ci-template.yml b/.github/workflows/server-ci-template.yml
index 61fd912264..a21db74950 100644
--- a/.github/workflows/server-ci-template.yml
+++ b/.github/workflows/server-ci-template.yml
@@ -300,7 +300,7 @@ jobs:
       logsartifact: mmctl-test-logs
   build-mattermost-server:
     name: Build mattermost server app
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: server