diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 825a71ead..24a972548 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -198,7 +198,7 @@ build fbsql amd64:
     paths:
       - ./build/fbsql_*
 
-build fbsql arm64:
+build fbsql arm64 darwin:
   stage: test
   variables:
     BUILD_NAME: build_${CI_COMMIT_SHA}_${CI_CONCURRENT_ID}
@@ -209,12 +209,27 @@ build fbsql arm64:
   script:
     - export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
     - date
-    - GOOS="linux" GOARCH="arm64" make docker-build-fbsql
     - GOOS="darwin" 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
+    - GOOS="linux" GOARCH="arm64" make docker-build-fbsql
+  artifacts:
+    paths:
+      - ./build/fbsql_*
+
 build amd container fb:
   stage: test
   tags: