diff --git a/.github/workflows/bst-build-test.yml b/.github/workflows/bst-build-test.yml
index a987301..399699d 100644
--- a/.github/workflows/bst-build-test.yml
+++ b/.github/workflows/bst-build-test.yml
@@ -16,15 +16,44 @@ name: BuildStream Build Test
 jobs:
   buildstream:
     name: Build
-    runs-on: ubuntu-latest
-    container:
-      image: registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images/bst2:36a24f5f2843fdb51aef130ef1ddfc99b5205e62
-      options: --privileged
+    runs-on: ubuntu-22.04
+    #container:
+    #  image: registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images/bst2:36a24f5f2843fdb51aef130ef1ddfc99b5205e62
+    #  options: --privileged
 
     steps:
+      - uses: easimon/maximize-build-space@v10
+        with:
+          remove-dotnet: true
+          remove-android: true
+          remove-haskell: true
+          remove-codeql: true
+          remove-docker-images: true
+
+      - name: Install BuildStream
+        run: |
+          mkdir ~/.local/bin
+          wget https://gitlab.com/BuildGrid/buildbox/buildbox-integration/-/releases/1.1.0/downloads/buildbox-x86_64-linux-gnu.tgz
+          tar -xvzf buildbox-x86_64-linux-gnu.tgz -C ~/.local/bin
+          rm -rf buildbox-x86_64-linux-gnu.tgz
+
+          sudo apt-get install bubblewrap fuse3 git lzip patch python3
+          sudo apt-get install g++ python3-dev python3-pip
+
+          pip3 install --user BuildStream==2.1.0
+        
       - uses: actions/checkout@v4
 
+      - name: Write BuildStream config
+        run: |
+          mkdir -p ~/.config
+          cat >> ~/.config/buildstream2.conf << EOF
+          sourcedir: ${GITHUB_WORKSPACE}/.bst/sources
+          cachedir: ${GITHUB_WORKSPACE}/.bst
+          logdir: ${GITHUB_WORKSPACE}/.bst/logs
+
       - name: Build Image
         working-directory: ./buildstream
         run: |
+          cd buildstream
           bst --on-error continue build oci/tooling-ghcr-flatpak.bst