diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 9f3e38d..cd45351 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -11,7 +11,7 @@ jobs:
     
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     
     - name: Set up Go
       uses: actions/setup-go@v5
@@ -43,13 +43,13 @@ jobs:
     
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
     
     - name: Build and cache Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: false
@@ -93,10 +93,10 @@ jobs:
     
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     
     - name: Download Docker image artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: docker-image-${{ github.run_id }}
         path: /tmp
diff --git a/cmd/main.go b/cmd/main.go
index 0e9ba42..e48d21c 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -467,6 +467,8 @@ func startFFmpegStream(ctx context.Context, config *Config, display string, stre
 		"-i", fmt.Sprintf("%s+0,0", display), // Specify exact offset
 		"-f", "alsa", // Use ALSA for audio capture (FFmpeg supports this)
 		"-i", "default", // Use ALSA default device (configured to route to PulseAudio)
+		"-map", "0:v", // Explicitly map video from input 0 (x11grab)
+		"-map", "1:a", // Explicitly map audio from input 1 (alsa)
 		"-vf", "crop=in_w:in_h:0:0", // Crop to exact dimensions
 		"-c:v", "libx264",
 		"-preset", "veryfast",