diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 08e4272..b024289 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -23,7 +23,7 @@ jobs:
     uses: pion/.goassets/.github/workflows/test.reusable.yml@master
     strategy:
       matrix:
-        go: ["1.22", "1.21"] # auto-update/supported-go-version-list
+        go: ["1.23", "1.22"] # auto-update/supported-go-version-list
       fail-fast: false
     with:
       go-version: ${{ matrix.go }}
@@ -33,7 +33,7 @@ jobs:
     uses: pion/.goassets/.github/workflows/test-i386.reusable.yml@master
     strategy:
       matrix:
-        go: ["1.22", "1.21"] # auto-update/supported-go-version-list
+        go: ["1.23", "1.22"] # auto-update/supported-go-version-list
       fail-fast: false
     with:
       go-version: ${{ matrix.go }}
@@ -41,5 +41,5 @@ jobs:
   test-wasm:
     uses: pion/.goassets/.github/workflows/test-wasm.reusable.yml@master
     with:
-      go-version: "1.22" # auto-update/latest-go-version
+      go-version: "1.23" # auto-update/latest-go-version
     secrets: inherit
diff --git a/.golangci.yml b/.golangci.yml
index e06de4d..3520e0e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,9 @@
 # SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
 # SPDX-License-Identifier: MIT
 
+run:
+  timeout: 5m
+
 linters-settings:
   govet:
     enable: