diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fffaadb3..4b8e656a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,12 +219,14 @@ jobs:
   test-nuget:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, macos-13, macos-14, windows-2022, ubuntu-20.04-arm64]
+        os: [ubuntu-20.04, ubuntu-22.04-arm64, macos-12, macos-13, macos-14, windows-2022]
         dotnet: [netcoreapp3.1, net6.0, net7.0, net8.0]
         include:
         - os: windows-2022
           dotnet: net472
         exclude:
+        - os: ubuntu-22.04-arm64
+          dotnet: netcoreapp3.1
         - os: macos-14
           dotnet: netcoreapp3.1
       fail-fast: false
diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
index 0e22c879..884643cc 100644
--- a/.github/workflows/devcontainer.yml
+++ b/.github/workflows/devcontainer.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [ubuntu-latest, ubuntu-20.04-arm64]
+        runner: [ubuntu-latest, ubuntu-22.04-arm64]
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set up Docker Buildx