diff --git a/internal/audio/audio.go b/internal/audio/audio.go
index 470b9667..2912049a 100644
--- a/internal/audio/audio.go
+++ b/internal/audio/audio.go
@@ -1,5 +1,5 @@
-//go:build cgo && !arm
-// +build cgo,!arm
+//go:build cgo
+// +build cgo
 
 // Package audio provides real-time audio processing for JetKVM with low-latency streaming.
 //
diff --git a/internal/audio/batch_audio.go b/internal/audio/batch_audio.go
index 9e97dfe9..e50de5c2 100644
--- a/internal/audio/batch_audio.go
+++ b/internal/audio/batch_audio.go
@@ -1,4 +1,4 @@
-//go:build cgo && !arm
+//go:build cgo
 
 package audio
 
diff --git a/internal/audio/buffer_pool.go b/internal/audio/buffer_pool.go
index ad0430d6..acf74fc7 100644
--- a/internal/audio/buffer_pool.go
+++ b/internal/audio/buffer_pool.go
@@ -1,5 +1,5 @@
-//go:build cgo && !arm
-// +build cgo,!arm
+//go:build cgo
+// +build cgo
 
 package audio
 
diff --git a/internal/audio/cgo_audio.go b/internal/audio/cgo_audio.go
index 82f73055..3d512434 100644
--- a/internal/audio/cgo_audio.go
+++ b/internal/audio/cgo_audio.go
@@ -1,4 +1,4 @@
-//go:build cgo && !arm
+//go:build cgo
 
 package audio
 
diff --git a/internal/audio/output_streaming.go b/internal/audio/output_streaming.go
index ac309802..88a57e36 100644
--- a/internal/audio/output_streaming.go
+++ b/internal/audio/output_streaming.go
@@ -1,5 +1,5 @@
-//go:build cgo && !arm
-// +build cgo,!arm
+//go:build cgo
+// +build cgo
 
 package audio
 
diff --git a/internal/audio/supervisor.go b/internal/audio/supervisor.go
index 5b422207..2d96a7c0 100644
--- a/internal/audio/supervisor.go
+++ b/internal/audio/supervisor.go
@@ -1,5 +1,5 @@
-//go:build cgo && !arm
-// +build cgo,!arm
+//go:build cgo
+// +build cgo
 
 package audio