diff --git a/internal/audio/audio.go b/internal/audio/audio.go
index 470b966..2912049 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 9e97dfe..e50de5c 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 ad0430d..acf74fc 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 82f7305..3d51243 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 ac30980..88a57e3 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 5b42220..2d96a7c 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