diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index fe5e0a6ff..fbc93b346 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Build disk-mapper
         uses: ./.github/actions/build_disk_mapper
 
-  build-cli:
+  build-cli-linux-amd64:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go environment
@@ -73,3 +73,57 @@ jobs:
 
       - name: Build CLI
         uses: ./.github/actions/build_cli
+        with:
+          targetOS: linux
+          targetArch: amd64
+
+  build-cli-linux-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go environment
+        uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
+        with:
+          go-version: "1.19.1"
+
+      - name: Check out repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      - name: Build CLI
+        uses: ./.github/actions/build_cli
+        with:
+          targetOS: linux
+          targetArch: arm64
+
+  build-cli-darwin-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go environment
+        uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
+        with:
+          go-version: "1.19.1"
+
+      - name: Check out repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      - name: Build CLI
+        uses: ./.github/actions/build_cli
+        with:
+          targetOS: darwin
+          targetArch: amd64
+
+  build-cli-darwin-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go environment
+        uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
+        with:
+          go-version: "1.19.1"
+
+      - name: Check out repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      - name: Build CLI
+        uses: ./.github/actions/build_cli
+        with:
+          targetOS: darwin
+          targetArch: arm64