diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
index 7fe8ffd..07b6811 100644
--- a/.github/workflows/cli-tests.yml
+++ b/.github/workflows/cli-tests.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os:
           - name: linux
-            image: ubuntu-20.04 # Focal Fossa
+            image: ubuntu-24.04
           - name: mac
             image: macos-13
         python-version:
diff --git a/.github/workflows/provisioning-tests.yml b/.github/workflows/provisioning-tests.yml
index 7c49f13..923e304 100644
--- a/.github/workflows/provisioning-tests.yml
+++ b/.github/workflows/provisioning-tests.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-20.04 # Ubuntu 20.04 "Focal Fossa"
+          - ubuntu-24.04
         python-version: [ '3.11' ]
         services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms, designer+lms, enterprise-subsidy+enterprise-catalog+enterprise-access+lms, license-manager+lms]
       fail-fast: false # some services can be flaky; let others run to completion even if one fails
@@ -56,7 +56,7 @@ jobs:
         # 2023-09-28: google-cloud-sdk removed from this list because it was intermittently
         #   unavailable as an apt package to remove, and might be migrating to snap. If more
         #   disk space is needed, see if the snap is installed, and remove that.
-        run:  sudo apt remove --purge -y ghc-* azure-cli hhvm llvm-* dotnet-* powershell mono-* php* ruby*
+        run:  sudo apt remove --purge -y ghc-* azure-cli llvm-* dotnet-* powershell mono-* php* ruby*
 
       - name: set up requirements
         run:  make requirements
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 27182da..495b0c7 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -12,7 +12,7 @@ on:
 jobs:
 
   run_ci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       DEVSTACK_WORKSPACE: /tmp
       SHALLOW_CLONE: 1