diff --git a/dist/roverd b/dist/roverd
index 4ed5cce4..d165aa00 100755
Binary files a/dist/roverd and b/dist/roverd differ
diff --git a/dist/servoverifier b/dist/servoverifier
index bfd063e3..43f8df4f 100755
Binary files a/dist/servoverifier and b/dist/servoverifier differ
diff --git a/pi/asound.conf b/pi/asound.conf
index 5c9b48a0..2af6f193 100644
--- a/pi/asound.conf
+++ b/pi/asound.conf
@@ -1,14 +1,14 @@
-# Use the Google Voice HAT soundcard as the primary device by name (more robust than numeric card index)
+# Use the Google Voice HAT soundcard as the primary device by name (card id is "sndrpigooglevoi")
 options snd_rpi_googlevoicehat_soundcard index=0
 
 # Simple defaults: direct playback/capture on the voice HAT
 pcm.!default {
     type asym
-    playback.pcm "plughw:sndrpigooglevoicehat_soundcar,0"
-    capture.pcm "plughw:sndrpigooglevoicehat_soundcar,0"
+    playback.pcm "plughw:sndrpigooglevoi,0"
+    capture.pcm "plughw:sndrpigooglevoi,0"
 }
 
 ctl.!default {
     type hw
-    card sndrpigooglevoicehat_soundcar
+    card sndrpigooglevoi
 }
diff --git a/pi/bin/video-publisher.sh b/pi/bin/video-publisher.sh
index 2369455c..8d504d33 100644
--- a/pi/bin/video-publisher.sh
+++ b/pi/bin/video-publisher.sh
@@ -19,14 +19,14 @@ VIDEO_HEIGHT="${VIDEO_HEIGHT:-1080}"
 VIDEO_FPS="${VIDEO_FPS:-30}"
 VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}"
 AUDIO_ENABLE="${AUDIO_ENABLE:-0}"
-AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
+AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:sndrpigooglevoi,0}"
 AUDIO_RATE="${AUDIO_RATE:-16000}"
 AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}"
 AUDIO_BITRATE="${AUDIO_BITRATE:-64000}"
 
 # Normalize device if env still says "default"
 if [[ "${AUDIO_DEVICE}" == "default" ]]; then
-	AUDIO_DEVICE="plughw:sndrpigooglevoicehat_soundcar,0"
+	AUDIO_DEVICE="plughw:sndrpigooglevoi,0"
 fi
 # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
 FLIP_ARGS=(--rotation 180)
diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh
index a9c9b5ad..95dbb415 100755
--- a/pi/install_roverd.sh
+++ b/pi/install_roverd.sh
@@ -205,7 +205,7 @@ VIDEO_HEIGHT=720
 VIDEO_FPS=30
 VIDEO_BITRATE=3000000
 AUDIO_ENABLE=1
-AUDIO_DEVICE=plughw:sndrpigooglevoicehat_soundcar,0
+AUDIO_DEVICE=plughw:sndrpigooglevoi,0
 AUDIO_RATE=16000
 AUDIO_CHANNELS=1
 AUDIO_BITRATE=64000
diff --git a/pi/roverd/config.go b/pi/roverd/config.go
index 1ed76956..2a4513b0 100644
--- a/pi/roverd/config.go
+++ b/pi/roverd/config.go
@@ -142,7 +142,7 @@ func LoadConfig(path string) (*Config, error) {
 		},
 		Audio: AudioConfig{
 			CaptureEnabled: true,
-			CaptureDevice:  "plughw:0,0",
+			CaptureDevice:  "plughw:sndrpigooglevoi,0",
 			SampleRate:     16000,
 			Channels:       1,
 			Bitrate:        64000,
diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml
index 8ebaf4b9..657a39fd 100644
--- a/pi/roverd/roverd.sample.yaml
+++ b/pi/roverd/roverd.sample.yaml
@@ -39,7 +39,7 @@ cameraServo:
   allowRawPulse: false
 audio:
   captureEnabled: true
-  captureDevice: plughw:0,0
+  captureDevice: plughw:sndrpigooglevoi,0
   sampleRate: 16000
   channels: 1
   bitrate: 64000