diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ad065f..28eb2ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        framework: [netcoreapp3.1, net5.0, net48]
+        framework: [net48, net5.0, net6.0, net7.0]
         os: [ubuntu-latest]
         test: [""]
         configuration: [release]
@@ -39,15 +39,13 @@ jobs:
     - name: Pull EventStore Image
       run: |
         docker pull ghcr.io/eventstore/eventstore:${{ matrix.docker-tag }}
-    - name: Install netcoreapp3.1
-      uses: actions/setup-dotnet@v1
-      if: matrix.framework == 'netcoreapp3.1'
+    - name: Install dotnet
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
-    - name: Install net5.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
+        dotnet-version: |
+          5.0.x
+          6.0.x
+          7.0.x
     - name: Restore
       run: |
         dotnet restore
@@ -64,20 +62,9 @@ jobs:
       run: |
         ./gencert.sh
         dotnet test --configuration ${{ matrix.configuration }} --blame \
-          --logger:html --logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
-          --results-directory=$(pwd)/test-results/test/EventStore.ClientAPI${{ matrix.test }}.Tests \
+          --logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
           --framework ${{ matrix.framework }} \
           test/EventStore.ClientAPI${{ matrix.test }}.Tests
-    - name: Collect Test Results
-      if: always()
-      run: |
-        echo $(find ./test-results -name "*.html" | xargs cat) > test-results.html
-    - name: Publish Test Results (HTML)
-      uses: actions/upload-artifact@v1
-      if: always()
-      with:
-        path: test-results.html
-        name: test-results-${{ matrix.configuration }}-${{ matrix.os }}-${{ matrix.framework }}-EventStore.ClientAPI${{ matrix.test }}.html
   publish:
     timeout-minutes: 5
     needs: [build-dotnet]
@@ -96,14 +83,13 @@ jobs:
         dotnet tool restore
         version=$(dotnet tool run minver -- --tag-prefix=v)
         echo "version=${version}" >> $GITHUB_OUTPUT
-    - name: Install netcoreapp3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-    - name: Install net5.0
-      uses: actions/setup-dotnet@v1
+    - name: Install dotnet
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: |
+          5.0.x
+          6.0.x
+          7.0.x
     - name: Dotnet Pack
       run: |
         dotnet pack /p:Version=${{ steps.get_version.outputs.version }} --configuration=Release --output=./packages \
diff --git a/Directory.Build.props b/Directory.Build.props
index 3c57d53..46ff31a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<TargetFrameworks>netcoreapp3.1;net48;net5.0</TargetFrameworks>
+		<TargetFrameworks>net48;net5.0;net6.0;net7.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>EventStore.ClientAPI</RootNamespace>
 		<UseLinkBase>true</UseLinkBase>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 81bde3b..ea018cf 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,16 +1,15 @@
 <Project>
+
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
-	<PropertyGroup>
-		<RootNamespace>EventStore.ClientAPI</RootNamespace>
-		<UseLinkBase>true</UseLinkBase>
-	</PropertyGroup>
+
 	<ItemGroup>
-		<PackageReference Include="Ductus.FluentDocker" Version="2.10.7"/>
-		<PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1"/>
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
+		<PackageReference Include="Ductus.FluentDocker" Version="2.10.57"/>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1"/>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0"/>
 		<PackageReference Include="Polly" Version="7.2.1"/>
-		<PackageReference Include="xunit" Version="2.4.1"/>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="xunit" Version="2.4.2"/>
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>