diff --git a/build.sh b/build.sh
index 401727e..2c3fa32 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 ./generate.sh
-go build
+GOOS=darwin go build $@
diff --git a/release_tools/package.sh b/release_tools/package.sh
index c27c188..65f0048 100755
--- a/release_tools/package.sh
+++ b/release_tools/package.sh
@@ -13,7 +13,14 @@ test() {
 }
 
 install_package() {
-  ./build.sh
+  GOARCH="amd64" ./build.sh -o "$RELEASE_DIR/alfred-aws-console-services-workflow-amd64"
+  GOARCH="arm64" ./build.sh -o "$RELEASE_DIR/alfred-aws-console-services-workflow-arm64"
+  lipo -create -output "$RELEASE_DIR/alfred-aws-console-services-workflow" \
+    "$RELEASE_DIR/alfred-aws-console-services-workflow-arm64" \
+    "$RELEASE_DIR/alfred-aws-console-services-workflow-amd64"
+
+  rm -f "$RELEASE_DIR/alfred-aws-console-services-workflow-arm64" \
+    "$RELEASE_DIR/alfred-aws-console-services-workflow-amd64"
 }
 
 sign_binary() {
@@ -75,7 +82,7 @@ sign_binary
 package_release
 notarize_package
 add_version_to_package_name
-bump_version_and_tag
 create_dummy_awgo_updater_file
+bump_version_and_tag
 open_github
 open_finder