diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03c7ce7d8..aab9cf874 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -116,7 +116,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           sudo apt-get install -y zip
-          make build-all-android
+          make build-android-bundle
           gh release upload "${{ inputs.tag }}" \
             build/picoclaw-android-universal.zip \
             --clobber
diff --git a/Makefile b/Makefile
index 1cc853458..beddd1138 100644
--- a/Makefile
+++ b/Makefile
@@ -216,15 +216,12 @@ build-android-arm64: generate
 build-launcher-android-arm64:
 	@echo "Building picoclaw-launcher for android/arm64..."
 	@mkdir -p $(BUILD_DIR)
-	@$(MAKE) -C web build \
-		OUTPUT="$(CURDIR)/$(BUILD_DIR)/picoclaw-launcher-android-arm64" \
-		WEB_GO='GOOS=android GOARCH=arm64 CGO_ENABLED=0 go' \
-		GO_BUILD_TAGS='stdjson' \
-		LDFLAGS='$(LDFLAGS)'
+	@$(MAKE) -C web build-android-arm64 \
+		OUTPUT="$(CURDIR)/$(BUILD_DIR)/picoclaw-launcher-android-arm64"
 	@echo "Build complete: $(BUILD_DIR)/picoclaw-launcher-android-arm64"
 
-## build-all-android: Build core and launcher for all Android architectures and package as universal zip
-build-all-android: generate
+## build-android-bundle: Build core and launcher for all Android architectures and package as universal zip
+build-android-bundle: generate
 	@echo "Building core for all Android architectures..."
 	@mkdir -p $(BUILD_DIR)
 	GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-android-arm64 ./$(CMD_DIR)
@@ -260,7 +257,7 @@ build-all: generate
 	GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
 	GOOS=netbsd GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-amd64 ./$(CMD_DIR)
 	GOOS=netbsd GOARCH=arm64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-arm64 ./$(CMD_DIR)
-	@$(MAKE) build-all-android
+	@$(MAKE) build-android-bundle
 	@echo "All builds complete"
 
 ## install: Install picoclaw to system and copy builtin skills
diff --git a/web/Makefile b/web/Makefile
index 58b65621d..cf5ea774a 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,5 +1,5 @@
 .PHONY: dev dev-frontend dev-backend build build-frontend build-dev-picoclaw test lint clean \
-	build-android-arm64 build-all-android
+	build-android-arm64 build-android-bundle
 
 # Go variables
 GO?=CGO_ENABLED=0 go
@@ -99,7 +99,7 @@ build-android-arm64: build-frontend
 	GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(OUTPUT_ANDROID_ARM64)" ./$(BACKEND_DIR)/
 
 # Build launcher for all Android architectures
-build-all-android: build-frontend
+build-android-bundle: build-frontend
 	@mkdir -p $(BUILD_DIR)
 	GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(BUILD_DIR)/picoclaw-launcher-android-arm64" ./$(BACKEND_DIR)/
 	@echo "All Android launcher builds complete"
diff --git a/web/backend/systray.go b/web/backend/systray.go
index 204bd7dc6..41fea1fbe 100644
--- a/web/backend/systray.go
+++ b/web/backend/systray.go
@@ -1,4 +1,4 @@
-//go:build (!darwin && !freebsd && !android) || cgo
+//go:build !android && ((!darwin && !freebsd) || cgo)
 
 package main