diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f64f1ff4dd..73c7f94bd4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -720,6 +720,7 @@ jobs:
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
+          - aarch64-unknown-freebsd # skip-main
         include:
           - mode: dev
             target: x86_64-unknown-linux-gnu
@@ -729,6 +730,8 @@ jobs:
             # to generate their Dockerfiles.
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
+          - target: aarch64-unknown-freebsd
+            os: ubuntu-24.04-arm
           - mode: dev
             target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
@@ -921,6 +924,8 @@ jobs:
             # to generate their Dockerfiles.
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
+          - target: aarch64-unknown-freebsd
+            os: ubuntu-24.04-arm
           - mode: dev
             target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
@@ -1103,6 +1108,7 @@ jobs:
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
           - aarch64-unknown-linux-musl # skip-pr skip-main
+          - aarch64-unknown-freebsd # skip-main
           - powerpc64-unknown-linux-gnu # skip-pr
           - x86_64-unknown-linux-musl # skip-pr
           - i686-unknown-linux-gnu # skip-pr skip-main
@@ -1136,6 +1142,8 @@ jobs:
             # to generate their Dockerfiles.
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
+          - target: aarch64-unknown-freebsd
+            os: ubuntu-24.04-arm
           - mode: dev
             target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
index 7ff9a5469e..b21fdf63ac 100644
--- a/ci/actions-templates/linux-builds-template.yaml
+++ b/ci/actions-templates/linux-builds-template.yaml
@@ -25,7 +25,7 @@ jobs: # skip-main skip-pr skip-stable
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
           - aarch64-unknown-linux-musl # skip-pr skip-main
-          - aarch64-unknown-freebsd # skip-pr skip-main skip-stable
+          - aarch64-unknown-freebsd # skip-main
           - powerpc64-unknown-linux-gnu # skip-pr
           - x86_64-unknown-linux-musl # skip-pr
           - i686-unknown-linux-gnu # skip-pr skip-main
@@ -59,6 +59,8 @@ jobs: # skip-main skip-pr skip-stable
             # to generate their Dockerfiles.
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
+          - target: aarch64-unknown-freebsd
+            os: ubuntu-24.04-arm
           - mode: dev
             target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm