diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19f17de..10df646 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,16 @@
 name: CI
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+      - master
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - main
+      - master
 
 jobs:
   build:
@@ -11,13 +21,12 @@ jobs:
       matrix:
         os: [ubuntu-20.04, windows-2019]
         sourcemod-version: [1.11-dev]
+        python-version: ['3.10']
         include:
           - os: ubuntu-20.04
-            target-archs: x86,x86_64
             sdks: css,csgo
           - os: windows-2019
-            target-archs: x86,x86_64
-            sdks: csgo
+            sdks: css,csgo
 
     steps:
       - name: Install Linux packages
@@ -27,42 +36,32 @@ jobs:
           sudo apt install -yq --no-install-recommends g++-multilib
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: extension
 
       - name: Checkout SourceMod
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: alliedmodders/sourcemod
           ref: ${{ matrix.sourcemod-version }}
           path: sourcemod
           submodules: recursive
 
-      - name: Checkout AMBuild
-        uses: actions/checkout@v2
-        with:
-          repository: alliedmodders/ambuild
-          path: ambuild
-
-      - name: Checkout sm-ext-common
-        uses: actions/checkout@v2
-        with:
-          repository: srcdslab/sm-ext-common
-          path: sourcemod/extensions/sm-ext-common
+      - name: Install AMBuild
+        run: |
+          python -m pip install wheel
+          pip install git+https://github.com/alliedmodders/ambuild
 
       - name: Install sourcemod dependencies
         run: |
           bash sourcemod/tools/checkout-deps.sh -m -s ${{ matrix.sdks }}
 
-      - name: Install AMBuild
-        uses: BSFishy/pip-action@v1
-        with:
-          packages: ./ambuild
-
       - name: Build
         working-directory: extension
         shell: bash
@@ -70,16 +69,15 @@ jobs:
           BREAKPAD_SYMBOL_SERVER: ${{ secrets.BREAKPAD_SYMBOL_SERVER }}
         run: |
           mkdir build && cd build
-          python ../configure.py --enable-optimize --targets=${{ matrix.target-archs }} --sdks=${{ matrix.sdks }}
+          python ../configure.py --enable-optimize --symbol-files --sdks=${{ matrix.sdks }}
           ambuild
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ runner.os }}
           path: extension/build/package
 
-
   release:
     name: Release
     if: startsWith(github.ref, 'refs/tags/')
@@ -88,7 +86,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
 
       - name: Package
         run: |
diff --git a/AMBuilder b/AMBuilder
index c619b81..7a40daa 100644
--- a/AMBuilder
+++ b/AMBuilder
@@ -29,7 +29,6 @@ for cxx in builder.targets:
 
     binary.sources += [
       'extension.cpp',
-      os.path.join(SM.sm_root, 'extensions', 'sm-ext-common', 'mathstubs.c'),
       os.path.join(SM.sm_root, 'public', 'smsdk_ext.cpp'),
       os.path.join(SM.sm_root, 'public', 'CDetour', 'detours.cpp'),
       os.path.join(SM.sm_root, 'public', 'asm', 'asm.c'),