diff --git a/Makefile b/Makefile
index 0baa954..227d31d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,8 @@ endif
 # Build
 #########################################
 
-LDFLAGS := -ldflags='-w -X "main.standaloneVersion=$(VERSION)" -extldflags "-static"'
+LDFLAGS := -ldflags='-w -X "main.standaloneVersion=$(VERSION)" -extldflags "-static"' \
+	-tags standalone
 
 download:
 	$Q cd gui; \
diff --git a/gui/hsm.go b/gui/hsm.go
index acc1f3f..1d9aa2e 100644
--- a/gui/hsm.go
+++ b/gui/hsm.go
@@ -1,4 +1,4 @@
-//go:build amd64
+//go:build !standalone
 
 package main
 
diff --git a/gui/hsm_arm64.go b/gui/hsm_standalone.go
similarity index 96%
rename from gui/hsm_arm64.go
rename to gui/hsm_standalone.go
index 5494159..e378095 100644
--- a/gui/hsm_arm64.go
+++ b/gui/hsm_standalone.go
@@ -1,4 +1,4 @@
-//go:build arm64
+//go:build standalone
 
 package main