diff --git a/.github/workflows/docker-push-mirrored.yml b/.github/workflows/docker-push-mirrored.yml
index 69b6b282a9..dd13edcdbd 100644
--- a/.github/workflows/docker-push-mirrored.yml
+++ b/.github/workflows/docker-push-mirrored.yml
@@ -11,7 +11,7 @@ jobs:
   build-docker:
     name: cd/Push mirrored docker images
     if: github.repository_owner == 'mattermost'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout mattermost project
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
diff --git a/.github/workflows/e2e-fulltests-ci.yml b/.github/workflows/e2e-fulltests-ci.yml
index c9af14ecde..aeaff17f76 100644
--- a/.github/workflows/e2e-fulltests-ci.yml
+++ b/.github/workflows/e2e-fulltests-ci.yml
@@ -36,7 +36,7 @@ concurrency:
 
 jobs:
   generate-test-variables:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
diff --git a/.github/workflows/e2e-tests-ci-template.yml b/.github/workflows/e2e-tests-ci-template.yml
index bde107e7c1..ede42c7e3d 100644
--- a/.github/workflows/e2e-tests-ci-template.yml
+++ b/.github/workflows/e2e-tests-ci-template.yml
@@ -77,7 +77,7 @@ on:
 
 jobs:
   update-initial-status:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: mattermost/actions/delivery/update-commit-status@main
         env:
@@ -90,7 +90,7 @@ jobs:
           status: pending
 
   cypress-check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - update-initial-status
     defaults:
@@ -121,7 +121,7 @@ jobs:
           npm run check
 
   playwright-check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - update-initial-status
     defaults:
@@ -158,7 +158,7 @@ jobs:
           npm run check
 
   generate-build-variables:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - update-initial-status
     defaults:
@@ -181,7 +181,7 @@ jobs:
           echo "workers="$(jq --slurp --compact-output '[range('"$WORKERS"')] | map(tostring)' /dev/null) >> $GITHUB_OUTPUT
 
   generate-test-cycle:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - update-initial-status
     defaults:
@@ -297,7 +297,7 @@ jobs:
             e2e-tests/cypress/results/
 
   report:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs:
       - test
       - generate-build-variables
@@ -353,7 +353,7 @@ jobs:
           make publish-report
 
   update-failure-final-status:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: failure() || cancelled()
     needs:
       - generate-test-cycle
@@ -373,7 +373,7 @@ jobs:
           target_url: "${{ needs.generate-test-cycle.outputs.status_check_url }}"
 
   update-success-final-status:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: success()
     needs:
       - generate-test-cycle
diff --git a/server/build/Dockerfile b/server/build/Dockerfile
index 6a4a0af4db..088dbc3b82 100644
--- a/server/build/Dockerfile
+++ b/server/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20230308@sha256:7a57c69fe1e9d5b97c5fe649849e79f2cfc3bf11d10bbd5218b4eb61716aebe6
+FROM ubuntu:noble-20240605@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
 
 # Setting bash as our shell, and enabling pipefail option
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -18,7 +18,8 @@ RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
   ca-certificates \
   curl \
-  mime-support \
+  media-types \
+  mailcap \
   unrtf \
   wv \
   poppler-utils \
@@ -28,8 +29,8 @@ RUN apt-get update \
 
 # Set mattermost group/user and download Mattermost
 RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins \
-  && addgroup -gid ${PGID} mattermost \
-  && adduser -q --disabled-password --uid ${PUID} --gid ${PGID} --gecos "" --home /mattermost mattermost \
+  && groupadd --gid ${PGID} mattermost \
+  && useradd --uid ${PUID} --gid ${PGID} --comment "" --home-dir /mattermost mattermost \
   && curl -L $MM_PACKAGE | tar -xvz \
   && chown -R mattermost:mattermost /mattermost /mattermost/data /mattermost/plugins /mattermost/client/plugins