diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9f48d7..838cc86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   build:
     name: build openrc-image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 720
     steps:
       - name: Configure Environment [branch]
@@ -36,9 +36,10 @@ jobs:
           else
             echo 'OE_BRANCH='${{ github.base_ref}} >> $GITHUB_ENV
           fi
-      - name: Install required packages
+      - name: Configure Host
         run: |
-          sudo apt-get install diffstat
+          sudo apt-get install chrpath diffstat python3-websockets
+          echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -63,16 +64,20 @@ jobs:
           echo 'BB_SIGNATURE_HANDLER = "OEEquivHash"' >> conf/local.conf
           echo 'SSTATE_MIRRORS += "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"' >> conf/local.conf
           echo 'BB_HASHSERVE = "auto"' >> conf/local.conf
-          echo 'BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"' >> conf/local.conf
+          echo 'BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws"' >> conf/local.conf
           echo 'BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},100M,10K HALT,${TMPDIR},50M,5k"' >> conf/local.conf
           if [ ${{ env.OE_BRANCH }} != "kirkstone" ]; then
             echo 'INIT_MANAGER = "openrc"' >> conf/local.conf
           else
             echo 'DISTRO_FEATURES += "openrc"' >> conf/local.conf
           fi
-      - name: Build operc image
+      - name: Build openrc image
         run: |
           source poky/oe-init-build-env build
+          # Build in stages so we can wipe tmp in between to stay under the
+          # 14Gb of disk Github gives us.  rm_work isn't sufficient.
+          bitbake openrc
+          rm -rf tmp/
           bitbake openrc-image
       - name: Prune Shared-State Cache and tmpdir
         if: always()