diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f8547b3b6..faf884c35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,14 +29,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Nuget
-        uses: nuget/setup-nuget@v1
-        with:
-          nuget-api-key: ${{ secrets.NuGetAPIKey }}
-          nuget-version: '5.x'
-
-      - run: nuget restore '${{ env.solution }}'
-
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1.3
         with:
@@ -140,8 +132,7 @@ jobs:
 
   linux:
     name: 'Linux'
-    runs-on: ubuntu-20.04
-    container: s1lentq/linux86buildtools:latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -150,9 +141,16 @@ jobs:
           fetch-depth: 0
           submodules: true
 
+      - name: Check dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install -y clang
+          sudo apt-get install -y gcc-multilib g++-multilib
+
       - name: Build and Run unittests
         run: |
-          rm -rf build && CC=icc CXX=icpc cmake -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
+          rm -rf build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
           retVal=0
           ./build/regamedll/cs 2> /dev/null > result.log || retVal=$?
           while read line; do
@@ -173,17 +171,9 @@ jobs:
           fi
         shell: bash
 
-      - name: Build using Intel C++ Compiler 19.0 (only for release)
-        if: |
-          github.event_name == 'release' &&
-          github.event.action == 'published' &&
-          startsWith(github.ref, 'refs/tags/')
-        run: |
-          rm -rf build-icc && CC=icc CXX=icpc cmake -B build-icc && cmake --build build-icc -j8
-
-      - name: Build using GCC Compiler 9.3
+      - name: Build using Clang C++ Compiler
         run: |
-          rm -rf build-gcc && CC=gcc CXX=g++ cmake -B build-gcc && cmake --build build-gcc -j8
+          rm -rf build && CC=clang CXX=clang++ cmake -B build && cmake --build build -j8
 
       - name: Prepare CSSDK
         run: |
@@ -193,8 +183,7 @@ jobs:
       - name: Move files
         run: |
           mkdir -p publish/bin/linux32/cstrike/dlls
-          mv build-icc/regamedll/cs.so publish/bin/linux32/cstrike/dlls/cs.so 2>/dev/null || true
-          mv build-gcc/regamedll/cs.so publish/cs-gcc.so
+          mv build/regamedll/cs.so publish/bin/linux32/cstrike/dlls/cs.so 2>/dev/null || true
           mv regamedll/version/appversion.h publish/appversion.h
           mv dist/ publish/
 
@@ -202,7 +191,6 @@ jobs:
         run: |
           binaries=(
             "publish/bin/linux32/cstrike/dlls/cs.so"
-            "publish/cs-gcc.so"
           )
           bash ./regamedll/version/glibc_test.sh ${binaries[@]}
           if [[ $? -ne 0 ]]; then
diff --git a/regamedll/public/tier0/platform.h b/regamedll/public/tier0/platform.h
index 5703cf53b..96a208dc3 100644
--- a/regamedll/public/tier0/platform.h
+++ b/regamedll/public/tier0/platform.h
@@ -41,7 +41,7 @@
 #endif
 
 // Used to step into the debugger
-#if defined(__GNUC__) && !defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
 	#define DebuggerBreak() __asm__ __volatile__("int3;")
 #else
 	#define DebuggerBreak() __asm { int 3 }