diff --git a/ci/pipelines/cf-mgmt/pipeline.yml b/ci/pipelines/cf-mgmt/pipeline.yml
index 04febce0..c04b0edb 100644
--- a/ci/pipelines/cf-mgmt/pipeline.yml
+++ b/ci/pipelines/cf-mgmt/pipeline.yml
@@ -405,9 +405,11 @@ jobs:
       globs:
       - compiled-output/cf-mgmt-linux
       - compiled-output/cf-mgmt-osx
+      - compiled-output/cf-mgmt-osx-arm64
       - compiled-output/cf-mgmt.exe
       - compiled-output/cf-mgmt-config-linux
       - compiled-output/cf-mgmt-config-osx
+      - compiled-output/cf-mgmt-config-osx-arm64
       - compiled-output/cf-mgmt-config.exe
   - load_var: github-release-url
     file: releases/url
diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh
index 3ef10925..dd1ab3da 100755
--- a/ci/tasks/build.sh
+++ b/ci/tasks/build.sh
@@ -41,10 +41,12 @@ cp -R ${SOURCE_DIR}/* ${WORKING_DIR}/.
 pushd ${WORKING_DIR} > /dev/null
   CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt-linux -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt/main.go
   GOOS=darwin GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt-osx -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt/main.go
+  GOOS=darwin GOARCH=arm64 go build -o ${OUTPUT_DIR}/cf-mgmt-osx-arm64 -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt/main.go
   GOOS=windows GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt.exe -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt/main.go
 
   CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt-config-linux -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt-config/main.go
   GOOS=darwin GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt-config-osx -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt-config/main.go
+  GOOS=darwin GOARCH=arm64 go build -o ${OUTPUT_DIR}/cf-mgmt-config-osx-arm64 -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt-config/main.go
   GOOS=windows GOARCH=amd64 go build -o ${OUTPUT_DIR}/cf-mgmt-config.exe -ldflags "-X github.com/vmwarepivotallabs/cf-mgmt/configcommands.VERSION=${VERSION} -X github.com/vmwarepivotallabs/cf-mgmt/configcommands.COMMIT=${COMMIT}" cmd/cf-mgmt-config/main.go
 
   cp Dockerfile ${OUTPUT_DIR}/.