diff --git a/src/Indiwiz.Trading.Application/Indiwiz.Trading.Application.csproj b/src/Indiwiz.Trading.Application/Indiwiz.Trading.Application.csproj
index 9e26897..832cc97 100644
--- a/src/Indiwiz.Trading.Application/Indiwiz.Trading.Application.csproj
+++ b/src/Indiwiz.Trading.Application/Indiwiz.Trading.Application.csproj
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Indiwiz.Trading.Data/Indiwiz.Trading.Data.csproj b/src/Indiwiz.Trading.Data/Indiwiz.Trading.Data.csproj
index e92cd9b..bf7dd0d 100644
--- a/src/Indiwiz.Trading.Data/Indiwiz.Trading.Data.csproj
+++ b/src/Indiwiz.Trading.Data/Indiwiz.Trading.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Indiwiz.Trading.Database/Indiwiz.Trading.Database.sqlproj b/src/Indiwiz.Trading.Database/Indiwiz.Trading.Database.sqlproj
index 41c908a..4ce3b45 100644
--- a/src/Indiwiz.Trading.Database/Indiwiz.Trading.Database.sqlproj
+++ b/src/Indiwiz.Trading.Database/Indiwiz.Trading.Database.sqlproj
@@ -1,66 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build">
+  <Sdk Name="Microsoft.Build.Sql" Version="0.1.12-preview" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <Name>Indiwiz.Trading.Database</Name>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>4.1</ProjectVersion>
-    <ProjectGuid>{f61369d8-dc06-4e82-8607-3dfd3bf03520}</ProjectGuid>
+    <ProjectGuid>{85677255-6F9D-4F77-AA8E-99E8097FCAF3}</ProjectGuid>
     <DSP>Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider</DSP>
-    <OutputType>Database</OutputType>
-    <RootPath>
-    </RootPath>
-    <RootNamespace>Indiwiz.Trading.Database</RootNamespace>
-    <AssemblyName>Indiwiz.Trading.Database</AssemblyName>
     <ModelCollation>1033, CI</ModelCollation>
-    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
-    <DeployToDatabase>True</DeployToDatabase>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetLanguage>CS</TargetLanguage>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <SqlServerVerification>False</SqlServerVerification>
-    <IncludeCompositeObjects>True</IncludeCompositeObjects>
-    <TargetDatabaseSet>True</TargetDatabaseSet>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
-    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
-    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <ItemGroup>
-    <Folder Include="Properties" />
-    <Folder Include="Tables" />
-  </ItemGroup>
   <ItemGroup>
-    <Build Include="Tables\Instrument.sql" />
-    <Build Include="Tables\Order.sql" />
-    <Build Include="Tables\Activity.sql" />
+    <None Include="Scripts\SetGroupIdForSoldStocks.sql"/>
   </ItemGroup>
+  <Target Name="BeforeBuild">
+    <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Indiwiz.Trading.Domain/Indiwiz.Trading.Domain.csproj b/src/Indiwiz.Trading.Domain/Indiwiz.Trading.Domain.csproj
index cfadb03..30402ac 100644
--- a/src/Indiwiz.Trading.Domain/Indiwiz.Trading.Domain.csproj
+++ b/src/Indiwiz.Trading.Domain/Indiwiz.Trading.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Indiwiz.Trading.Infrastructure/Indiwiz.Trading.Infrastructure.csproj b/src/Indiwiz.Trading.Infrastructure/Indiwiz.Trading.Infrastructure.csproj
index 123825c..6224168 100644
--- a/src/Indiwiz.Trading.Infrastructure/Indiwiz.Trading.Infrastructure.csproj
+++ b/src/Indiwiz.Trading.Infrastructure/Indiwiz.Trading.Infrastructure.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Indiwiz.Trading.UnitTests/Indiwiz - Backup.Trading.UnitTests.csproj b/src/Indiwiz.Trading.UnitTests/Indiwiz - Backup.Trading.UnitTests.csproj
index 57a2d19..4232a3f 100644
--- a/src/Indiwiz.Trading.UnitTests/Indiwiz - Backup.Trading.UnitTests.csproj	
+++ b/src/Indiwiz.Trading.UnitTests/Indiwiz - Backup.Trading.UnitTests.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/src/Indiwiz.Trading.Web/Indiwiz.Trading.Web.csproj b/src/Indiwiz.Trading.Web/Indiwiz.Trading.Web.csproj
index 8b5c675..47b8ee2 100644
--- a/src/Indiwiz.Trading.Web/Indiwiz.Trading.Web.csproj
+++ b/src/Indiwiz.Trading.Web/Indiwiz.Trading.Web.csproj
@@ -7,7 +7,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/Indiwiz.Trading.sln b/src/Indiwiz.Trading.sln
index 3f61cdb..265e52e 100644
--- a/src/Indiwiz.Trading.sln
+++ b/src/Indiwiz.Trading.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Indiwiz.Trading.UnitTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Indiwiz.Trading.Web", "Indiwiz.Trading.Web\Indiwiz.Trading.Web.csproj", "{CEACCD23-3EEE-44B7-BCCA-4E842CA55BFB}"
 EndProject
-Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Indiwiz.Trading.Database", "Indiwiz.Trading.Database\Indiwiz.Trading.Database.sqlproj", "{F61369D8-DC06-4E82-8607-3DFD3BF03520}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Indiwiz.Trading.Database", "Indiwiz.Trading.Database\Indiwiz.Trading.Database.sqlproj", "{85677255-6F9D-4F77-AA8E-99E8097FCAF3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,11 +41,10 @@ Global
 		{CEACCD23-3EEE-44B7-BCCA-4E842CA55BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CEACCD23-3EEE-44B7-BCCA-4E842CA55BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CEACCD23-3EEE-44B7-BCCA-4E842CA55BFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F61369D8-DC06-4E82-8607-3DFD3BF03520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F61369D8-DC06-4E82-8607-3DFD3BF03520}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F61369D8-DC06-4E82-8607-3DFD3BF03520}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{F61369D8-DC06-4E82-8607-3DFD3BF03520}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F61369D8-DC06-4E82-8607-3DFD3BF03520}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{85677255-6F9D-4F77-AA8E-99E8097FCAF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85677255-6F9D-4F77-AA8E-99E8097FCAF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85677255-6F9D-4F77-AA8E-99E8097FCAF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85677255-6F9D-4F77-AA8E-99E8097FCAF3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE