diff --git a/.github/workflows/kb-build.yml b/.github/workflows/kb-build.yml
index 49da94a..cff3f78 100644
--- a/.github/workflows/kb-build.yml
+++ b/.github/workflows/kb-build.yml
@@ -21,7 +21,9 @@ jobs:
   build:
     name: ${{ matrix.module }}-${{ matrix.os }}-${{ matrix.bitness }}
     runs-on: ${{ matrix.runner }}
-    container: ${{ matrix.container }}
+    container:
+      image: ${{ matrix.container }}
+      options: --user builder
     strategy:
       fail-fast: false
       matrix:
@@ -57,8 +59,7 @@ jobs:
             arch: >
               -DCMAKE_C_FLAGS=-m32
               -DCMAKE_CXX_FLAGS=-m32
-              -DCMAKE_EXE_LINKER_FLAGS="-m32 -L/usr/lib/i386-linux-gnu"
-              -DCMAKE_PREFIX_PATH=/usr/lib/i386-linux-gnu
+              -DCMAKE_EXE_LINKER_FLAGS=-m32
 
           - os: Linux
             bitness: 64
@@ -76,7 +77,7 @@ jobs:
 
           # Container
           - os: Linux
-            container: ghcr.io/acidicoala/koalabox:master@sha256:fd79048173e2fd77838ac34066c5ec5320930fbc436df1cff549cf11cd6e2454
+            container: ghcr.io/acidicoala/koalabox:master@sha256:b389a8f522ce3d38f2e50570fb772beebbf0211b2d748210628091d42ee0bce5
 
     env:
       BUILD_DIR: ${{ github.workspace }}/build
diff --git a/KoalaBox b/KoalaBox
index 5c2d477..d6550fb 160000
--- a/KoalaBox
+++ b/KoalaBox
@@ -1 +1 @@
-Subproject commit 5c2d477c5f3368f0d7b43b70997265077b6d0882
+Subproject commit d6550fb20038951577ed5ecd45eced133c22419d