diff --git a/.github/workflows/android_editor_builds.yml b/.github/workflows/android_editor_builds.yml
index c20fd9cfb..b08175a0d 100644
--- a/.github/workflows/android_editor_builds.yml
+++ b/.github/workflows/android_editor_builds.yml
@@ -12,20 +12,13 @@ concurrency:
 
 jobs:
   android-editor:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
 
     name: Android Editor (target=release_debug, tools=yes)
 
     steps:
       - uses: actions/checkout@v4
 
-      # Azure repositories are not reliable, we need to prevent azure giving us packages.
-      - name: Make apt sources.list use the default Ubuntu repositories
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/*
-          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
-          sudo apt-get update
-
       - name: Set up Java 17
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/http_server_builds.yml b/.github/workflows/http_server_builds.yml
index f883cb8f2..968370f54 100644
--- a/.github/workflows/http_server_builds.yml
+++ b/.github/workflows/http_server_builds.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   build-server:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
@@ -36,14 +36,14 @@ jobs:
       - name: Linux dependencies
         shell: bash
         run: |
-          # Azure repositories are not reliable, we need to prevent azure giving us packages.
-          sudo rm -f /etc/apt/sources.list.d/*
-          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
+          # Azure repositories are flaky, remove them.
+          sudo rm -f /etc/apt/sources.list.d/{azure,microsoft}*
           sudo apt-get update
           # The actual dependencies
-          sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
-              libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
-              libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip
+          sudo apt-get install --no-install-recommends build-essential pkg-config libx11-dev \
+              libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev \
+              libpulse-dev libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip \
+              libspeechd-dev speech-dispatcher
 
       - name: Restore Pandemonium build cache
         uses: ./.github/actions/pandemonium-cache-restore