diff --git a/.acceptance.goreleaser.yml b/.acceptance.goreleaser.yml
index f96f03d5..b3e10084 100644
--- a/.acceptance.goreleaser.yml
+++ b/.acceptance.goreleaser.yml
@@ -12,10 +12,15 @@ builds:
     env:
       - CC=x86_64-linux-gnu-gcc
       - CXX=x86_64-linux-gnu-g++
+      - CGO_ENABLED=1
+      - GOFLAGS=
+      - CGO_LDFLAGS=
 
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser
 
+    tags: []
+
 archives:
   - id: homebrew
     format: tar.gz
diff --git a/.github/workflows/01-tailpipe-release.yaml b/.github/workflows/01-tailpipe-release.yaml
index c2e8e2ea..4345a0fd 100644
--- a/.github/workflows/01-tailpipe-release.yaml
+++ b/.github/workflows/01-tailpipe-release.yaml
@@ -67,7 +67,7 @@ jobs:
   build_and_release:
     name: Build and Release Tailpipe
     needs: [ensure_branch_in_homebrew]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: validate
         if: github.ref == 'refs/heads/develop'
@@ -110,6 +110,20 @@ jobs:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           ref: main
 
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Docker (if needed)
+        run: |
+          if ! command -v docker &> /dev/null; then
+            sudo apt-get update
+            sudo apt-get install -y docker.io
+          fi
+
+      - name: Verify Docker installation
+        run: |
+          docker --version
+
       - name: Calculate version
         id: calculate_version
         run: |
diff --git a/.github/workflows/11-test-acceptance.yaml b/.github/workflows/11-test-acceptance.yaml
index cc81641a..cbcbc901 100644
--- a/.github/workflows/11-test-acceptance.yaml
+++ b/.github/workflows/11-test-acceptance.yaml
@@ -16,7 +16,7 @@ env:
 jobs:
   goreleaser:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d8e8a667..f8834287 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,40 +1,50 @@
 version: 2
 
 builds:
-  - id: tailpipe-linux-arm64
+  - id: tailpipe-linux-amd64
     binary: tailpipe
     goos:
       - linux
     goarch:
-      - arm64
+      - amd64
 
     env:
-      - CC=aarch64-linux-gnu-gcc
-      - CXX=aarch64-linux-gnu-g++
+      - CC=x86_64-linux-gnu-gcc
+      - CXX=x86_64-linux-gnu-g++
+      - CGO_ENABLED=1
+      - GOFLAGS=
+      - CGO_LDFLAGS=
 
     # Custom ldflags.
     #
     # Default: '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser'
     # Templates: allowed
     ldflags:
-      # Go Releaser analyzes your Git repository and identifies the most recent Git tag (typically the highest version number) as the version for your release.
+      # Goreleaser analyzes your Git repository and identifies the most recent Git tag (typically the highest version number) as the version for your release.
       # This is how it determines the value of {{.Version}}.
       - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser
 
-  - id: tailpipe-linux-amd64
+    tags: []
+
+  - id: tailpipe-linux-arm64
     binary: tailpipe
     goos:
       - linux
     goarch:
-      - amd64
+      - arm64
 
     env:
-      - CC=x86_64-linux-gnu-gcc
-      - CXX=x86_64-linux-gnu-g++
+      - CC=gcc
+      - CXX=g++
+      - CGO_ENABLED=1
+      - GOFLAGS=
+      - CGO_LDFLAGS=
 
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X main.builtBy=goreleaser
 
+    tags: []
+
   - id: tailpipe-darwin-arm64
     binary: tailpipe
     goos:
diff --git a/Makefile b/Makefile
index 42138790..74f25773 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 OUTPUT_DIR?=/usr/local/bin
 PACKAGE_NAME          := github.com/turbot/tailpipe
-GOLANG_CROSS_VERSION  ?= gcc13-osxcross-20250912194615
+GOLANG_CROSS_VERSION  ?= gcc13-osxcross-20251006102018
 
 # sed 's/[\/_]/-/g': Replaces both slashes (/) and underscores (_) with hyphens (-).
 # sed 's/[^a-zA-Z0-9.-]//g': Removes any character that isn’t alphanumeric, a dot (.), or a hyphen (-).
@@ -30,6 +30,7 @@ release-dry-run:
 release-acceptance:
 	@docker run \
 		--rm \
+		--platform=linux/arm64 \
 		-e CGO_ENABLED=1 \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/tailpipe \
@@ -48,6 +49,7 @@ release:
 	fi
 	docker run \
 		--rm \
+		--platform=linux/arm64 \
 		-e CGO_ENABLED=1 \
 		--env-file .release-env \
 		-v /var/run/docker.sock:/var/run/docker.sock \