diff --git a/.github/workflows/build-hogql-parser.yml b/.github/workflows/build-hogql-parser.yml
index 8f528a1cc5552e..13b6781971ab0f 100644
--- a/.github/workflows/build-hogql-parser.yml
+++ b/.github/workflows/build-hogql-parser.yml
@@ -41,18 +41,21 @@ jobs:
         timeout-minutes: 120 # The Linux ARM builds are painfully slow
         strategy:
             matrix:
-                os: [ubuntu-22.04, macos-12]
+                # ARM emulation is reasonably fast on macOS, but insanely slow (20x longer) on Linux runners
+                os: [ubuntu-22.04, buildjet-2vcpu-ubuntu-2204-arm, macos-12]
 
         steps:
             - uses: actions/checkout@v4
 
-            - name: Set up QEMU for Linux ARM builds
-              if: runner.os == 'Linux'
-              uses: docker/setup-qemu-action@v3
+            - if: ${{ !endsWith(matrix.os, '-arm') }}
+              uses: actions/setup-python@v4
               with:
-                  platforms: linux/arm64
+                  python-version: '3.10'
 
-            - uses: actions/setup-python@v3
+            - if: ${{ endsWith(matrix.os, '-arm') }}
+              uses: deadsnakes/action@v3 # Unfortunately actions/setup-python@v4 just doesn't work on ARM !!! This does
+              with:
+                  python-version: '3.10'
 
             - name: Build sdist
               if: matrix.os == 'ubuntu-22.04' # Only build the sdist once
diff --git a/hogql_parser/pyproject.toml b/hogql_parser/pyproject.toml
index f117d1d0a7206b..58f7c0cc1aaea4 100644
--- a/hogql_parser/pyproject.toml
+++ b/hogql_parser/pyproject.toml
@@ -34,6 +34,6 @@ before-all = [
     "cp out/usr/local/lib64/libantlr4-runtime.so* /usr/lib64/",
     "ldconfig",
 ]
-archs = ["x86_64", "aarch64"]
+archs = ["native"] # We run x86_64 and aarch64 as separate CI jobs, and we want native in each case as emulation is slow
 manylinux-x86_64-image = "manylinux_2_28"
 manylinux-aarch64-image = "manylinux_2_28"
diff --git a/plugin-server/.editorconfig b/plugin-server/.editorconfig
index b0b709a63cc2de..bb602f22e57fcf 100644
--- a/plugin-server/.editorconfig
+++ b/plugin-server/.editorconfig
@@ -12,3 +12,6 @@ max_line_length = 120
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2