diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
index 07a776d29..a7c3252aa 100644
--- a/.github/workflows/test-code.yml
+++ b/.github/workflows/test-code.yml
@@ -31,9 +31,8 @@ jobs:
           - ubuntu-latest
           - windows-latest
         graphqlversion:
-          - 5.1.1
-          - 5.2.0
-          - 5.3.1
+          - 7.0.2
+          - 7.1.1
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
diff --git a/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj b/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj
index 191202673..a4a0d00d1 100644
--- a/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj
+++ b/src/GraphQL.Relay.StarWars/GraphQL.Relay.StarWars.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.3.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.1" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.1.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.0.2" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.2" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay.StarWars/Startup.cs b/src/GraphQL.Relay.StarWars/Startup.cs
index 0d553aa0b..902a212ff 100644
--- a/src/GraphQL.Relay.StarWars/Startup.cs
+++ b/src/GraphQL.Relay.StarWars/Startup.cs
@@ -1,9 +1,6 @@
-using GraphQL.MicrosoftDI;
 using GraphQL.Relay.StarWars.Api;
 using GraphQL.Relay.StarWars.Types;
 using GraphQL.Relay.Types;
-using GraphQL.Server;
-using GraphQL.SystemTextJson;
 using GraphQL.Types.Relay;
 
 namespace GraphQL.Relay.StarWars
@@ -28,8 +25,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddGraphQL(b => b
                 .AddApolloTracing(true)
-                .AddHttpMiddleware<StarWarsSchema>()
                 .AddSchema<StarWarsSchema>()
+                .AddAutoClrMappings()
                 .AddSystemTextJson()
                 .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true)
                 .AddGraphTypes(typeof(StarWarsSchema).Assembly));
@@ -43,7 +40,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseGraphQL<StarWarsSchema>();
+            app.UseGraphQL();
             app.UseGraphQLGraphiQL();
         }
     }
diff --git a/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj b/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
index 62aec7aa3..e09fcfb58 100644
--- a/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
+++ b/src/GraphQL.Relay.Test/GraphQL.Relay.Test.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6</TargetFramework>
-    <GraphQLTestVersion>5.1.1</GraphQLTestVersion>
+    <GraphQLTestVersion>7.0.2</GraphQLTestVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj b/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj
index d57a78d52..42ec09b28 100644
--- a/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj
+++ b/src/GraphQL.Relay.Todo/GraphQL.Relay.Todo.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.3.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.1" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.1.0" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.0.2" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.2" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.1.1" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.9" />
   </ItemGroup>
 
diff --git a/src/GraphQL.Relay.Todo/Startup.cs b/src/GraphQL.Relay.Todo/Startup.cs
index f90dc7ae0..48d2324c2 100644
--- a/src/GraphQL.Relay.Todo/Startup.cs
+++ b/src/GraphQL.Relay.Todo/Startup.cs
@@ -1,8 +1,5 @@
 using System.Text;
-using GraphQL.MicrosoftDI;
 using GraphQL.Relay.Todo.Schema;
-using GraphQL.Server;
-using GraphQL.SystemTextJson;
 
 namespace GraphQL.Relay.Todo
 {
@@ -12,11 +9,10 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddGraphQL(b => b
                 .AddApolloTracing(true)
-                .AddHttpMiddleware<TodoSchema>()
                 .AddSchema<TodoSchema>()
+                .AddAutoClrMappings()
                 .AddSystemTextJson()
-                .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true)
-                .AddSystemTextJson());
+                .AddErrorInfoProvider(options => options.ExposeExceptionStackTrace = true));
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -39,7 +35,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app
                 .UseStaticFiles()
                 .UseDefaultFiles()
-                .UseGraphQL<TodoSchema>()
+                .UseGraphQL()
                 .UseGraphQLGraphiQL();
         }
     }
diff --git a/src/GraphQL.Relay/GraphQL.Relay.csproj b/src/GraphQL.Relay/GraphQL.Relay.csproj
index e4e621718..7e1efeeaa 100644
--- a/src/GraphQL.Relay/GraphQL.Relay.csproj
+++ b/src/GraphQL.Relay/GraphQL.Relay.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL" Version="5.1.1" />
+    <PackageReference Include="GraphQL" Version="7.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tests.props b/src/Tests.props
index d6b04d4fb..97d8df65f 100644
--- a/src/Tests.props
+++ b/src/Tests.props
@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />