diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
index 936f3aef2..9c3f5b740 100644
--- a/.github/workflows/buildtest.yaml
+++ b/.github/workflows/buildtest.yaml
@@ -33,8 +33,15 @@ jobs:
       - name: Set up gotestfmt
         run: go install github.com/haveyoudebuggedit/gotestfmt/v2/cmd/gotestfmt@latest
 
-      - name: Download Go modules
-        run: go mod download
+      - name: Replace mutexes
+        run: |
+          go get github.com/sasha-s/go-deadlock
+          grep -rl sync.Mutex ./pkg | xargs sed -i 's/sync\.Mutex/deadlock\.Mutex/g'
+          grep -rl sync.RWMutex ./pkg | xargs sed -i 's/sync\.RWMutex/deadlock\.RWMutex/g'
+          go install golang.org/x/tools/cmd/goimports
+          grep -rl deadlock.Mutex ./pkg | xargs goimports -w
+          grep -rl deadlock.RWMutex ./pkg | xargs goimports -w
+          go mod tidy
 
       - name: Mage Build
         uses: magefile/mage-action@v1
diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go
index 0b85c353e..e140ea8c4 100644
--- a/pkg/service/wire_gen.go
+++ b/pkg/service/wire_gen.go
@@ -9,6 +9,8 @@ package service
 import (
 	"context"
 	"fmt"
+	"os"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/livekit/livekit-server/pkg/config"
 	"github.com/livekit/livekit-server/pkg/routing"
@@ -19,7 +21,6 @@ import (
 	"github.com/livekit/protocol/webhook"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
-	"os"
 )
 
 // Injectors from wire.go: