diff --git a/HelpMyStreet.Utils/HelpMyStreet.Cache/HelpMyStreet.Cache.csproj b/HelpMyStreet.Utils/HelpMyStreet.Cache/HelpMyStreet.Cache.csproj
index b14550298..598c76626 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.Cache/HelpMyStreet.Cache.csproj
+++ b/HelpMyStreet.Utils/HelpMyStreet.Cache/HelpMyStreet.Cache.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>HelpMyStreet</Company>
     <Product>HelpMyStreet</Product>
@@ -13,9 +13,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.9" />
-    <PackageReference Include="Polly" Version="7.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
     <PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
diff --git a/HelpMyStreet.Utils/HelpMyStreet.Contracts/HelpMyStreet.Contracts.csproj b/HelpMyStreet.Utils/HelpMyStreet.Contracts/HelpMyStreet.Contracts.csproj
index 3aa79c0d2..c5204144a 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.Contracts/HelpMyStreet.Contracts.csproj
+++ b/HelpMyStreet.Utils/HelpMyStreet.Contracts/HelpMyStreet.Contracts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>HelpMyStreet</Company>
     <Product>HelpMyStreet</Product>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="8.1.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="MediatR" Version="10.0.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/Extensions/ModelBuilderExtensions.cs b/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/Extensions/ModelBuilderExtensions.cs
index a2fd23b8d..e3f7934ba 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/Extensions/ModelBuilderExtensions.cs
+++ b/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/Extensions/ModelBuilderExtensions.cs
@@ -123,16 +123,16 @@ private static void SetupPostcodeCoordinateTables<T>(EntityTypeBuilder<T> entity
         private static void SetupPostcodeDefaultIndexes<T>(EntityTypeBuilder<T> entity) where T : PostcodeEntityBase
         {
             entity.HasIndex(u => u.Postcode)
-                .HasName("UX_Postcode_Postcode")
+                .HasDatabaseName("UX_Postcode_Postcode")
                 .IsUnique();
 
             entity.HasIndex(u => new { u.Postcode, u.IsActive })
-                .HasName("IX_Postcode_Postcode_IsActive")
-                .ForSqlServerInclude(nameof(PostcodeEntityBase.Latitude), nameof(PostcodeEntityBase.Longitude));
+                .HasDatabaseName("IX_Postcode_Postcode_IsActive")
+                .IncludeProperties(nameof(PostcodeEntityBase.Latitude), nameof(PostcodeEntityBase.Longitude));
 
             entity.HasIndex(u => new { u.Latitude, u.Longitude, u.IsActive })
-                .ForSqlServerInclude(nameof(PostcodeEntityBase.Postcode))
-                .HasName("IX_Postcode_Latitude_Longitude_IsActive");
+                .HasDatabaseName("IX_Postcode_Latitude_Longitude_IsActive")
+                .IncludeProperties(nameof(PostcodeEntityBase.Postcode));
         }
 
     }
diff --git a/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/HelpMyStreet.PostcodeCoordinates.EF.csproj b/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/HelpMyStreet.PostcodeCoordinates.EF.csproj
index 416ef0e65..de7410c4a 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/HelpMyStreet.PostcodeCoordinates.EF.csproj
+++ b/HelpMyStreet.Utils/HelpMyStreet.PostcodeCoordinates.EF/HelpMyStreet.PostcodeCoordinates.EF.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Company>HelpMyStreet</Company>
     <Product>HelpMyStreet</Product>
     <Authors>HelpMyStreet</Authors>
@@ -10,9 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.9" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.9" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/HelpMyStreet.Utils/HelpMyStreet.UnitTests/HelpMyStreet.UnitTests.csproj b/HelpMyStreet.Utils/HelpMyStreet.UnitTests/HelpMyStreet.UnitTests.csproj
index 84dd29859..5661cc66b 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.UnitTests/HelpMyStreet.UnitTests.csproj
+++ b/HelpMyStreet.Utils/HelpMyStreet.UnitTests/HelpMyStreet.UnitTests.csproj
@@ -1,28 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
-
+		<TargetFramework>net6.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<PackageId>HelpMyStreet.CoreV3.UnitTests</PackageId>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-		<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
-		<PackageReference Include="Moq" Version="4.14.7" />
-		<PackageReference Include="NewRelic.Agent.Api" Version="8.33.0" />
-		<PackageReference Include="NUnit" Version="3.12.0" />
-		<PackageReference Include="Polly" Version="7.2.1" />
+		<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+		<PackageReference Include="Moq" Version="4.17.2" />
+		<PackageReference Include="NewRelic.Agent.Api" Version="9.7.0" />
+		<PackageReference Include="NUnit" Version="3.13.3" />
+		<PackageReference Include="Polly" Version="7.2.3" />
 		<PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
 		<PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
 		<PackageReference Include="Utf8Json" Version="1.3.7" />
 		<PackageReference Include="Polly.Caching.MemoryCache" Version="1.1.0" />
 	</ItemGroup>
diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils.sln b/HelpMyStreet.Utils/HelpMyStreet.Utils.sln
index 98fd25106..dd27f73e8 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.Utils.sln
+++ b/HelpMyStreet.Utils/HelpMyStreet.Utils.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29905.134
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelpMyStreet.Utils", "HelpMyStreet.Utils\HelpMyStreet.Utils.csproj", "{16EB0369-C3E5-45D7-AAF6-1F19951627E2}"
 EndProject
diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/CoordinatedResetCache/CoordinatedResetCache.cs b/HelpMyStreet.Utils/HelpMyStreet.Utils/CoordinatedResetCache/CoordinatedResetCache.cs
index c2b9907ce..baf36b0e5 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.Utils/CoordinatedResetCache/CoordinatedResetCache.cs
+++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/CoordinatedResetCache/CoordinatedResetCache.cs
@@ -27,7 +27,7 @@ public CoordinatedResetCache(IPollyMemoryCacheProvider pollyMemoryCacheProvider,
         [Obsolete("Use MemDistCache in HelpMyStreet.Cache package")]
         public async Task<T> GetCachedDataAsync<T>(Func<CancellationToken, Task<T>> dataGetter, string key, CancellationToken cancellationToken, CoordinatedResetCacheTime resetCacheTime = CoordinatedResetCacheTime.OnHour)
         {
-            TimeSpan timeToReset;
+            TimeSpan timeToReset = GetLengthOfTimeUntilNextHour();
 
             switch (resetCacheTime)
             {
diff --git a/HelpMyStreet.Utils/HelpMyStreet.Utils/HelpMyStreet.Utils.csproj b/HelpMyStreet.Utils/HelpMyStreet.Utils/HelpMyStreet.Utils.csproj
index 0535aef94..8aad37987 100644
--- a/HelpMyStreet.Utils/HelpMyStreet.Utils/HelpMyStreet.Utils.csproj
+++ b/HelpMyStreet.Utils/HelpMyStreet.Utils/HelpMyStreet.Utils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>HelpMyStreet</Company>
     <Product>HelpMyStreet</Product>
@@ -13,15 +13,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.9" />
-    <PackageReference Include="NewRelic.Agent.Api" Version="8.33.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Polly" Version="7.2.1" />
+    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="NewRelic.Agent.Api" Version="9.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="Polly.Caching.Memory" Version="3.0.2" />
     <PackageReference Include="Polly.Contrib.DuplicateRequestCollapser" Version="0.2.1" />
-	<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
+	<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>