diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3cb3ef..1889a51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,11 +24,11 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.7
         with:
-          versionSpec: "5.6.x"
+          versionSpec: "5.8.x"
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "8.0.x"
       - name: Install dependencies
         run: dotnet restore src
       - name: Use GitVersion
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f56a716..73103fb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,11 +19,11 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.7
         with:
-          versionSpec: "5.6.x"
+          versionSpec: "5.8.x"
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "8.0.x"
       - name: Install dependencies
         run: dotnet restore src
       - name: Use GitVersion
diff --git a/GitVersion.yml b/GitVersion.yml
index 5cb6811..1e8a51a 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 1.0.0
+next-version: 2.0.0
 mode: Mainline
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
diff --git a/src/content/api/src/LittleBlocks.Template.Client/LittleBlocks.Template.Client.csproj b/src/content/api/src/LittleBlocks.Template.Client/LittleBlocks.Template.Client.csproj
index 17be3b5..d799278 100644
--- a/src/content/api/src/LittleBlocks.Template.Client/LittleBlocks.Template.Client.csproj
+++ b/src/content/api/src/LittleBlocks.Template.Client/LittleBlocks.Template.Client.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>default</LangVersion>
-    <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LittleBlocks.RestEase" Version="1.0.2" />
+    <PackageReference Include="LittleBlocks.RestEase" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/content/api/src/LittleBlocks.Template.Common/LittleBlocks.Template.Common.csproj b/src/content/api/src/LittleBlocks.Template.Common/LittleBlocks.Template.Common.csproj
index 667ad15..b7c7104 100644
--- a/src/content/api/src/LittleBlocks.Template.Common/LittleBlocks.Template.Common.csproj
+++ b/src/content/api/src/LittleBlocks.Template.Common/LittleBlocks.Template.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
diff --git a/src/content/api/src/LittleBlocks.Template.Core.UnitTests/LittleBlocks.Template.Core.UnitTests.csproj b/src/content/api/src/LittleBlocks.Template.Core.UnitTests/LittleBlocks.Template.Core.UnitTests.csproj
index 842b0e2..4593ef7 100644
--- a/src/content/api/src/LittleBlocks.Template.Core.UnitTests/LittleBlocks.Template.Core.UnitTests.csproj
+++ b/src/content/api/src/LittleBlocks.Template.Core.UnitTests/LittleBlocks.Template.Core.UnitTests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LittleBlocks.Ef.Testing" Version="1.0.0" />
-    <PackageReference Include="LittleBlocks.Testing" Version="1.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="LittleBlocks.Ef.Testing" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Testing" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/content/api/src/LittleBlocks.Template.Core/LittleBlocks.Template.Core.csproj b/src/content/api/src/LittleBlocks.Template.Core/LittleBlocks.Template.Core.csproj
index 7924532..1042c93 100644
--- a/src/content/api/src/LittleBlocks.Template.Core/LittleBlocks.Template.Core.csproj
+++ b/src/content/api/src/LittleBlocks.Template.Core/LittleBlocks.Template.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="11.1.0" />
-    <PackageReference Include="LittleBlocks" Version="1.0.2" />
-    <PackageReference Include="LittleBlocks.Ef" Version="1.0.0" />
-    <PackageReference Include="LittleBlocks.RestEase.Client" Version="1.0.2" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="LittleBlocks" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Ef" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.RestEase.Client" Version="2.0.0" />
  </ItemGroup>
 
   <ItemGroup>
diff --git a/src/content/api/src/LittleBlocks.Template.WebApi.IntegrationTests/LittleBlocks.Template.WebApi.IntegrationTests.csproj b/src/content/api/src/LittleBlocks.Template.WebApi.IntegrationTests/LittleBlocks.Template.WebApi.IntegrationTests.csproj
index 29706f3..d1ae89b 100644
--- a/src/content/api/src/LittleBlocks.Template.WebApi.IntegrationTests/LittleBlocks.Template.WebApi.IntegrationTests.csproj
+++ b/src/content/api/src/LittleBlocks.Template.WebApi.IntegrationTests/LittleBlocks.Template.WebApi.IntegrationTests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LittleBlocks.Ef.Testing" Version="1.0.0" />
-    <PackageReference Include="LittleBlocks.Testing.Integration" Version="1.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="LittleBlocks.Ef.Testing" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Testing.Integration" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/content/api/src/LittleBlocks.Template.WebApi/Extensions/ServiceCollectionExtensions.cs b/src/content/api/src/LittleBlocks.Template.WebApi/Extensions/ServiceCollectionExtensions.cs
index 03cf6be..0169aeb 100644
--- a/src/content/api/src/LittleBlocks.Template.WebApi/Extensions/ServiceCollectionExtensions.cs
+++ b/src/content/api/src/LittleBlocks.Template.WebApi/Extensions/ServiceCollectionExtensions.cs
@@ -1,10 +1,8 @@
-using System.Reflection;
+using System;
 using LittleBlocks.Ef;
-using MediatR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using LittleBlocks.Template.Core.Data;
-using LittleBlocks.Template.Core.Shared;
 
 namespace LittleBlocks.Template.WebApi.Extensions
 {
@@ -12,7 +10,8 @@ public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddCoreServices(this IServiceCollection services)
         {
-            services.AddMediatR(typeof(HandlerBase).GetTypeInfo().Assembly);
+            services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(AppDomain.CurrentDomain.GetAssemblies()));
+
             return services;
         }
 
diff --git a/src/content/api/src/LittleBlocks.Template.WebApi/LittleBlocks.Template.WebApi.csproj b/src/content/api/src/LittleBlocks.Template.WebApi/LittleBlocks.Template.WebApi.csproj
index 6800353..f740d5d 100644
--- a/src/content/api/src/LittleBlocks.Template.WebApi/LittleBlocks.Template.WebApi.csproj
+++ b/src/content/api/src/LittleBlocks.Template.WebApi/LittleBlocks.Template.WebApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
@@ -15,11 +15,11 @@
 
   <ItemGroup>
     <PackageReference Include="Flache.CacheManager" Version="1.0.10" />
-    <PackageReference Include="LittleBlocks.RestEase" Version="1.0.2" />
-    <PackageReference Include="LittleBlocks.AspNetCore.Bootstrap" Version="1.0.2" />
-    <PackageReference Include="LittleBlocks.Logging.SeriLog.Loggly" Version="1.0.2" />
-    <PackageReference Include="LittleBlocks.Logging.SeriLog.Seq" Version="1.0.2" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
+    <PackageReference Include="LittleBlocks.RestEase" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.AspNetCore.Bootstrap" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Logging.SeriLog.Loggly" Version="2.0.0" />
+    <PackageReference Include="LittleBlocks.Logging.SeriLog.Seq" Version="2.0.0" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/templatepack.csproj b/src/templatepack.csproj
index b260e46..6c6c5b1 100644
--- a/src/templatepack.csproj
+++ b/src/templatepack.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.0.0</PackageVersion>
+    <PackageVersion>2.0.0</PackageVersion>
     <PackageId>LittleBlocks.API</PackageId>
     <Title>LittleBlocks Solution Template</Title>
     <Authors>Mohammad Moattar</Authors>
     <Description>Template generator for LittleBlocks framework</Description>
     <PackageTags>dotnet-new;templates;LittleBlocks</PackageTags>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Templates</RepositoryUrl>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>