diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cac69258..35f0241ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,12 +37,25 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        arch: [ amd64 ]
-        os: [ windows-2019, macos-11 ]
-        tfm: [ net472, net6.0, net7.0, net8.0 ]
+        arch: [ x64 ]
+        os: [ windows-2019, windows-2022, macos-11, macos-12, macos-13 ]
+        tfm: [ net472, net6.0, net8.0 ]
         exclude:
           - os: macos-11
             tfm: net472
+          - os: macos-11
+            tfm: net8.0
+          - os: macos-12
+            tfm: net472
+          - os: macos-13
+            tfm: net472
+        include:
+          - arch: arm64
+            os: macos-14
+            tfm: net6.0
+          - arch: arm64
+            os: macos-14
+            tfm: net8.0
       fail-fast: false
     steps:
       - name: Checkout
@@ -54,7 +67,6 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
-            7.0.x
             6.0.x
       - name: Run ${{ matrix.tfm }} tests
         run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
@@ -65,22 +77,26 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
-        distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, centos.stream.8, debian.10, debian.11, fedora.36, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
-        sdk:  [ '6.0', '7.0' , '8.0' ]
+        distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, alpine.3.18, centos.stream.8, debian.10, debian.11, fedora.36, fedora.37, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
+        sdk:  [ '6.0', '8.0' ]
         exclude:
-          - distro: alpine.3.13
-            sdk: '7.0'
-          - distro: alpine.3.14
-            sdk: '7.0'
           - distro: alpine.3.13
             sdk: '8.0'
           - distro: alpine.3.14
             sdk: '8.0'
+          - distro: alpine.3.15
+            sdk: '8.0'
+          - distro: alpine.3.16
+            sdk: '8.0'
+          - distro: debian.10
+            sdk: '8.0'
+          - distro: fedora.36
+            sdk: '8.0'
+          - distro: ubuntu.18.04
+            sdk: '8.0'
         include:
           - sdk: '6.0'
             tfm: net6.0
-          - sdk: '7.0'
-            tfm: net7.0
           - sdk: '8.0'
             tfm: net8.0
       fail-fast: false
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 8f5ac09dd..4d648eead 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>