diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index c974927bd..2b19b062c 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -203,19 +203,32 @@ build fbsql arm64:
   variables:
     BUILD_NAME: build_${CI_COMMIT_SHA}_${CI_CONCURRENT_ID}
   tags:
-    - shell-arm64
+    - shell
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
   script:
     - export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
     - date
     - GOOS="darwin" GOARCH="arm64" make docker-build-fbsql
-    - GOOS="linux" GOARCH="arm64" make docker-build-fbsql
-
+    
   artifacts:
     paths:
       - ./build/fbsql_*
 
+build fbsql arm64 linux:
+  stage: test
+  variables:
+    BUILD_NAME: build_${CI_COMMIT_SHA}_${CI_CONCURRENT_ID}
+  tags:
+    - shell-arm64
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
+  script:
+    - export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
+    - date
+  artifacts:
+    paths:
+      - ./build/fbsql_*
 
 build amd container fb:
   stage: test
@@ -371,7 +384,8 @@ run go tests cli kafka integration:
   needs:
     - job: build amd container fb
     - job: build fbsql amd64
-    - job: build fbsql arm64
+    - job: build fbsql arm64 linux
+    - job: build fbsql arm64 darwin
 
 # idk tests
 run go tests idk race:
@@ -738,7 +752,8 @@ s3 dump:
   needs:
     - job: build featurebase
     - job: build fbsql amd64
-    - job: build fbsql arm64
+    - job: build fbsql arm64 linux
+    - job: build fbsql arm64 darwin
 
 s3 dump tag:
   stage: post build
diff --git a/Dockerfile-fbsql-darwin b/Dockerfile-fbsql-darwin
index 177745dc9..b06c02e45 100644
--- a/Dockerfile-fbsql-darwin
+++ b/Dockerfile-fbsql-darwin
@@ -36,9 +36,14 @@ RUN apt-get update -y -qq && apt-get install -y -qq \
   zlib1g-dev \
   libbz2-dev \
   pkg-config \
-  librdkafka-dev \
   && rm -rf /var/lib/apt/lists/*
 
+RUN ["git", "clone", "https://github.com/edenhill/librdkafka.git"]
+WORKDIR /librdkafka
+RUN ./configure --prefix /usr &&\ 
+  make && \
+  make install
+
 WORKDIR /featurebase
 
 COPY . .
diff --git a/Makefile b/Makefile
index 203d58d6b..b32ba3be1 100644
--- a/Makefile
+++ b/Makefile
@@ -380,7 +380,7 @@ endif
 
 build-fbsql-darwin:
 ifeq ($(GOARCH), arm64)
-	env GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 CC=/osxcross/target/bin/arm64-apple-darwin21.4-clang $(GO) build  -tags dynamic $(GO_BUILD_FLAGS) -o fbsql ./cmd/fbsql
+	env GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 CC=/osxcross/target/bin/arm64-apple-darwin21.4-clang $(GO) build $(GO_BUILD_FLAGS) -o fbsql ./cmd/fbsql
 else ifeq ($(GOARCH), amd64)
 	env GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 CC=/osxcross/target/bin/x86_64-apple-darwin21.4-clang $(GO) build $(GO_BUILD_FLAGS) -o fbsql ./cmd/fbsql
 endif