diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eac2160..9be567f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "6.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 74e2492..cfa5c6f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "6.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/LittleBlocks.Notifications.Messaging.MailKit/LittleBlocks.Notifications.Messaging.MailKit.csproj b/src/LittleBlocks.Notifications.Messaging.MailKit/LittleBlocks.Notifications.Messaging.MailKit.csproj
index 76456b1..3d68dd1 100644
--- a/src/LittleBlocks.Notifications.Messaging.MailKit/LittleBlocks.Notifications.Messaging.MailKit.csproj
+++ b/src/LittleBlocks.Notifications.Messaging.MailKit/LittleBlocks.Notifications.Messaging.MailKit.csproj
@@ -10,13 +10,13 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
         <LangVersion>default</LangVersion>
-        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MailKit" Version="3.4.3" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+        <PackageReference Include="MailKit" Version="4.5.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/LittleBlocks.Notifications.Messaging/LittleBlocks.Notifications.Messaging.csproj b/src/LittleBlocks.Notifications.Messaging/LittleBlocks.Notifications.Messaging.csproj
index d5fbb52..f9ad34a 100644
--- a/src/LittleBlocks.Notifications.Messaging/LittleBlocks.Notifications.Messaging.csproj
+++ b/src/LittleBlocks.Notifications.Messaging/LittleBlocks.Notifications.Messaging.csproj
@@ -11,11 +11,11 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
         <LangVersion>default</LangVersion>
-        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.4.0" />
+        <PackageReference Include="FluentValidation" Version="11.9.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/LittleBlocks.Notifications.Templating.HandleBars/LittleBlocks.Notifications.Templating.HandleBars.csproj b/src/LittleBlocks.Notifications.Templating.HandleBars/LittleBlocks.Notifications.Templating.HandleBars.csproj
index af997b0..1b90366 100644
--- a/src/LittleBlocks.Notifications.Templating.HandleBars/LittleBlocks.Notifications.Templating.HandleBars.csproj
+++ b/src/LittleBlocks.Notifications.Templating.HandleBars/LittleBlocks.Notifications.Templating.HandleBars.csproj
@@ -10,7 +10,7 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
         <LangVersion>default</LangVersion>
-        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/LittleBlocks.Notifications.Templating.UnitTests/LittleBlocks.Notifications.Templating.UnitTests.csproj b/src/LittleBlocks.Notifications.Templating.UnitTests/LittleBlocks.Notifications.Templating.UnitTests.csproj
index 3819ea9..9322600 100644
--- a/src/LittleBlocks.Notifications.Templating.UnitTests/LittleBlocks.Notifications.Templating.UnitTests.csproj
+++ b/src/LittleBlocks.Notifications.Templating.UnitTests/LittleBlocks.Notifications.Templating.UnitTests.csproj
@@ -3,18 +3,18 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <LangVersion>default</LangVersion>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <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="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; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NSubstitute" Version="4.4.0" />
-        <PackageReference Include="FluentAssertions" Version="6.8.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/LittleBlocks.Notifications.Templating/LittleBlocks.Notifications.Templating.csproj b/src/LittleBlocks.Notifications.Templating/LittleBlocks.Notifications.Templating.csproj
index 2fd1c1b..4e8c6fc 100644
--- a/src/LittleBlocks.Notifications.Templating/LittleBlocks.Notifications.Templating.csproj
+++ b/src/LittleBlocks.Notifications.Templating/LittleBlocks.Notifications.Templating.csproj
@@ -10,7 +10,7 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
         <LangVersion>default</LangVersion>
-        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
 </Project>
diff --git a/src/LittleBlocks.Notifications.UnitTests/LittleBlocks.Notifications.UnitTests.csproj b/src/LittleBlocks.Notifications.UnitTests/LittleBlocks.Notifications.UnitTests.csproj
index c129d3a..af8f69c 100644
--- a/src/LittleBlocks.Notifications.UnitTests/LittleBlocks.Notifications.UnitTests.csproj
+++ b/src/LittleBlocks.Notifications.UnitTests/LittleBlocks.Notifications.UnitTests.csproj
@@ -3,19 +3,19 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <LangVersion>default</LangVersion>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-        <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="Microsoft.Extensions.Options" Version="8.0.2" />
+        <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; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NSubstitute" Version="4.4.0" />
-        <PackageReference Include="FluentAssertions" Version="6.8.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/LittleBlocks.Notifications/LittleBlocks.Notifications.csproj b/src/LittleBlocks.Notifications/LittleBlocks.Notifications.csproj
index 267c41e..9282279 100644
--- a/src/LittleBlocks.Notifications/LittleBlocks.Notifications.csproj
+++ b/src/LittleBlocks.Notifications/LittleBlocks.Notifications.csproj
@@ -10,15 +10,15 @@
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
         <LangVersion>default</LangVersion>
-        <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.4.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+        <PackageReference Include="FluentValidation" Version="11.9.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>