diff --git a/build.sh b/build.sh
index 23765d7..bef443c 100755
--- a/build.sh
+++ b/build.sh
@@ -107,9 +107,23 @@ echo "Building nextcloud-mail..."
 cd "$SCRIPT_DIR/tools/go/nextcloud-mail"
 
 # Build with compile-time credentials
-# Note: This simple approach works for most passwords but may fail with
-# passwords containing spaces, double quotes, or $ characters
-go build -ldflags="-X main.BuildIMAPServer=$IMAP_SERVER -X main.BuildIMAPPort=$IMAP_PORT -X main.BuildIMAPUser=$IMAP_USER -X main.BuildIMAPPassword=$IMAP_PASS -X main.BuildSMTPServer=$SMTP_SERVER -X main.BuildSMTPPort=$SMTP_PORT -X main.BuildSMTPUser=$SMTP_USER -X main.BuildSMTPPassword=$SMTP_PASS -X main.BuildUseSSL=$USE_SSL -X main.BuildIgnoreCerts=$IGNORE_CERTS" -o ~/bin/nextcloud-mail .
+# Use heredoc to write ldflags to temp file - handles # character
+LDFLAGS_FILE="/tmp/nextcloud-mail-ldflags.$$"
+cat > "$LDFLAGS_FILE" <<LDFLAGSEOF
+-X main.BuildIMAPServer=$IMAP_SERVER
+-X main.BuildIMAPPort=$IMAP_PORT
+-X main.BuildIMAPUser=$IMAP_USER
+-X main.BuildIMAPPassword=$IMAP_PASS
+-X main.BuildSMTPServer=$SMTP_SERVER
+-X main.BuildSMTPPort=$SMTP_PORT
+-X main.BuildSMTPUser=$SMTP_USER
+-X main.BuildSMTPPassword=$SMTP_PASS
+-X main.BuildUseSSL=$USE_SSL
+-X main.BuildIgnoreCerts=$IGNORE_CERTS
+LDFLAGSEOF
+
+go build -ldflags="$(cat "$LDFLAGS_FILE")" -o ~/bin/nextcloud-mail .
+rm -f "$LDFLAGS_FILE"
 echo "✓ nextcloud-mail built successfully"
 
 echo ""