diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4504611..d3c7859 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,7 +62,27 @@ jobs:
       cache: false
       cmd: "make validate"
 
-  build:
+  build-fleetctl:
+    uses: heathcliff26/ci/.github/workflows/golang-build.yaml@main
+    needs:
+      - lint
+      - unit-tests
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+          - arch: arm64
+    with:
+      release: "${{ github.event_name == 'pull_request' && 'dev' || inputs.tag == '' && 'rolling' || inputs.tag }}"
+      goos: "linux"
+      goarch: "${{ matrix.arch }}"
+      artifact: "bin/fleetctl-${{ matrix.arch }}"
+      artifact-name: "fleetctl-${{ matrix.arch }}"
+      cmd: "hack/build.sh fleetctl fleetctl-${{ matrix.arch }}"
+    secrets: inherit
+
+  build-fleetlock:
     uses: heathcliff26/ci/.github/workflows/build-container.yaml@main
     needs:
       - lint
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6c5734a..06f7c09 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -46,5 +46,5 @@ jobs:
       update: ${{ inputs.update }}
       tag: ${{ inputs.tag }}
       release-artifacts: "release/*"
-      artifacts: "{manifests}"
+      artifacts: "{fleetctl-*,manifests}"
       prerelease: ${{ inputs.prerelease }}