diff --git a/.buckconfig b/.buckconfig
index 78a9b9b..fe16b4c 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -5,4 +5,4 @@
     target = android-26
     build_tools_version = 27.0.3
 [download]
-    maven_repo = https://jcenter.bintray.com/
+    maven_repo = https://repo1.maven.org/maven2/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b23723..6601812 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,11 +4,48 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: thyrlian/android-sdk:latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Detect cgroup mode
+        run: |
+          if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
+            echo "Detected cgroup v2"
+          elif [ -d /sys/fs/cgroup/cpu ]; then
+            echo "Detected cgroup v1"
+          else
+            echo "::warning::Could not determine cgroup mode"
+          fi
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -yq curl openjdk-11-jre-headless python3 gcc
+          update-java-alternatives -s java-1.11.0-openjdk-amd64
+
+      - name: Install Buck
+        run: |
+          curl -L https://github.com/facebook/buck/releases/download/v2020.10.21.01/buck.2020.10.21.01_all.deb -o buck.deb
+          dpkg -i buck.deb
+          rm buck.deb
+
+      - name: Setup Android SDK
+        run: |
+          yes | sdkmanager --licenses > /dev/null 2>&1 || true
+          sdkmanager "build-tools;27.0.3" "platforms;android-26" > /dev/null
+
+      - name: Buck fetch
+        run: buck fetch //...
+
+      - name: Verify toolchain smoke test
+        run: |
+          buck --version
+          sdkmanager --list_installed | grep -i "build-tools;27.0.3" || echo "::warning::build-tools not found in cache"
+          sdkmanager --list_installed | grep -i "platforms;android-26" || echo "::warning::platform not found in cache"
+
       - name: Buck build
-        uses: passy/run-buck@v0.1.0
-        with:
-          commands: '/opt/android-sdk-linux/tools/bin/sdkmanager "build-tools;27.0.3" "platforms;android-26" > /dev/null; buck fetch //...; buck build :soloader'
+        run: buck build :soloader
         env:
           ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}