diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f8402f0..c4c7bfbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,8 +7,11 @@ on:
     branches: [ main ]
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        framework: ['net8.0', 'net10.0']
     env:
       NMS_AMQP_TEST_CU: "artemis"
       NMS_AMQP_TEST_CPWD: "artemis"
@@ -19,15 +22,15 @@ jobs:
       - name: Run ActiveMQ Artemis
         run: docker compose up -V -d
         working-directory: ./test
-      - name: Setup .NET 8
+      - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: |
+            8.0.x
+            10.0.x
       - name: Restore dependencies
         run: dotnet restore apache-nms-amqp.sln
-
       - name: Build
         run: dotnet build apache-nms-amqp.sln --configuration Release --no-restore
-
       - name: Test
-        run: dotnet test apache-nms-amqp.sln --configuration Release --no-build --verbosity normal
\ No newline at end of file
+        run: dotnet test apache-nms-amqp.sln --configuration Release --no-build --framework ${{ matrix.framework }} --verbosity normal
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 3add44fc..e97eb4ae 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <LangVersion>12</LangVersion>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/NMS.AMQP/Apache-NMS-AMQP.csproj b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
index 2e9da743..cdddae83 100644
--- a/src/NMS.AMQP/Apache-NMS-AMQP.csproj
+++ b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
@@ -18,7 +18,7 @@ with the License.  You may obtain a copy of the License at
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <RootNamespace>Apache.NMS.AMQP</RootNamespace>
         <AssemblyName>Apache.NMS.AMQP</AssemblyName>
     </PropertyGroup>