diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 515c7bf..b8df7e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
           2.1.x
           3.1.x
           6.0.x
+          8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 54519ec..b694304 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
       
     - name: Build for ARM64
       run: dotnet publish misc/Ae.Dns.Console/Ae.Dns.Console.csproj --configuration Release --runtime linux-arm64 --output build/linux/arm64
diff --git a/misc/Ae.Dns.Console/Ae.Dns.Console.csproj b/misc/Ae.Dns.Console/Ae.Dns.Console.csproj
index efe5d08..6941095 100644
--- a/misc/Ae.Dns.Console/Ae.Dns.Console.csproj
+++ b/misc/Ae.Dns.Console/Ae.Dns.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<OutputType>Exe</OutputType>
 		<IsPackable>false</IsPackable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/misc/Ae.Dns.Console/Startup.cs b/misc/Ae.Dns.Console/Startup.cs
index d5e16fb..7f61ceb 100644
--- a/misc/Ae.Dns.Console/Startup.cs
+++ b/misc/Ae.Dns.Console/Startup.cs
@@ -277,10 +277,10 @@ string CreateQueryStringWithout(string name)
                         switch (hostFilter)
                         {
                             case "match":
-                                query = query.Where(x => x.Query.Host.Contains(context.Request.Query["host"], StringComparison.InvariantCultureIgnoreCase));
+                                query = query.Where(x => x.Query.Host.Contains(context.Request.Query["host"]!, StringComparison.InvariantCultureIgnoreCase));
                                 break;
                             case "suffix":
-                                query = query.Where(x => x.Query.Host.EndsWith(context.Request.Query["host"], StringComparison.InvariantCultureIgnoreCase));
+                                query = query.Where(x => x.Query.Host.EndsWith(context.Request.Query["host"]!, StringComparison.InvariantCultureIgnoreCase));
                                 break;
                         }
                     }
diff --git a/tests/Ae.Dns.Tests/Client/DnsClientGenericTests.cs b/tests/Ae.Dns.Tests/Client/DnsClientGenericTests.cs
index fa7789d..a68e604 100644
--- a/tests/Ae.Dns.Tests/Client/DnsClientGenericTests.cs
+++ b/tests/Ae.Dns.Tests/Client/DnsClientGenericTests.cs
@@ -33,7 +33,7 @@ private static async Task TestClientLargeResponse1(IDnsClient client, bool trunc
             }
             else
             {
-                var answers = result.Answers.Select(x => x.Resource).Cast<DnsStringResource>().Select(x => x.Entries.Single()).ToArray();
+                var answers = result.Answers.Select(x => x.Resource).Cast<DnsStringResource>().Select(x => x.Entries.Single()).OrderBy(x => x).ToArray();
 
                 Assert.Equal(29, answers.Length);