diff --git a/d365-pcf-processsessions.proj b/d365-pcf-processsessions.proj
index 30437f9..b56f9a1 100644
--- a/d365-pcf-processsessions.proj
+++ b/d365-pcf-processsessions.proj
@@ -1,27 +1 @@
-<Project DefaultTargets="Build">
-    <Target Name="Restore">
-        <ItemGroup>
-            <ProjectFiles Include="**/*.*proj" Exclude="*.proj" />
-        </ItemGroup>
-        <Exec Command="npm install --no-audit --ignore-scripts --no-fund"
-              WorkingDirectory="$(MSBuildThisFileDirectory)/control" />
-        <Exec Command="npm audit --omit=dev"
-              WorkingDirectory="$(MSBuildThisFileDirectory)/control" />
-        <MSBuild Targets="Restore"
-                 Projects="@(ProjectFiles)" />
-    </Target>
-
-    <Target Name="Build">
-        <ItemGroup>
-            <PacSolutionFiles Include="**/*.cdsproj" />
-        </ItemGroup>
-        <MSBuild Targets="Build"
-                 Properties="Configuration=Release"
-                 Projects="@(PacSolutionFiles)" />
-    </Target>
-
-    <Target Name="Clean">
-        <Exec Command="git clean -ffdX"
-              WorkingDirectory="$(MSBuildThisFileDirectory)" />
-    </Target>
-</Project>
+<Project Sdk="Cathal.PcfTools.Proj/1.0.0" DefaultTargets="Build" />
diff --git a/solution/Directory.Build.targets b/solution/Directory.Build.targets
deleted file mode 100644
index 9798ade..0000000
--- a/solution/Directory.Build.targets
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-  TreatAsLocalProperty="temp_SolutionVersionNumber;temp_SolutionManagedSuffix;temp_SolutionUniqueName">
-
-  <!--
-    MSBuild target to set the solution name.
-
-    The aim of the task is to set the 'SolutionPackageZipFilePath' propery.
-    - Unmanaged: {UniqueName}_{Version}.zip
-    - Managed:   {UniqueName}_{Version}_managed.zip
-
-    Note:
-    - All properties named with the "temp_" prefix are only used within this file.
-  -->
-  <Target Name="SetSolutionZipName" BeforeTargets="PrepareForBuild">
-
-    <!-- Get solution unique name -->
-    <XmlPeek XmlInputPath="$(MSBuildProjectDirectory)\$(SolutionRootPath)\Other\Solution.xml"
-             Query="/ImportExportXml/SolutionManifest/UniqueName/text()">
-      <Output TaskParameter="Result" ItemName="temp_SolutionUniqueName" />
-    </XmlPeek>
-
-    <!-- Get solution version -->
-    <XmlPeek XmlInputPath="$(MSBuildProjectDirectory)\$(SolutionRootPath)\Other\Solution.xml"
-             Query="/ImportExportXml/SolutionManifest/Version/text()">
-      <Output TaskParameter="Result" ItemName="temp_SolutionVersionNumber" />
-    </XmlPeek>
-
-
-    <!--
-      Use the above variables and tasks to generate solution output path.
-    -->
-    <PropertyGroup>
-      <!-- Version Number: X_X_X_X (major_minor_build_revision) -->
-      <temp_SolutionVersionNumber>@(temp_SolutionVersionNumber)</temp_SolutionVersionNumber>
-      <temp_SolutionVersionNumber>$([System.Text.RegularExpressions.Regex]::Replace($(temp_SolutionVersionNumber),"\.", "_"))</temp_SolutionVersionNumber>
-
-      <!-- Managed suffix?: (not assigned for Unmanaged solution) -->
-      <temp_SolutionManagedSuffix Condition=" '$(SolutionPackageType)' != 'Managed' "></temp_SolutionManagedSuffix>
-      <temp_SolutionManagedSuffix Condition=" '$(SolutionPackageType)' == 'Managed' ">_managed</temp_SolutionManagedSuffix>
-
-      <!--
-        Combine the parts to make the solution name format
-        - Unmanaged: {UniqueName}_{Version}.zip
-        - Managed:   {UniqueName}_{Version}_managed.zip
-      -->
-      <temp_SolutionUniqueName>@(temp_SolutionUniqueName)_$(temp_SolutionVersionNumber)$(temp_SolutionManagedSuffix)</temp_SolutionUniqueName>
-
-      <!-- Assign SolutionPackageZipFilePath: Consumed by the dotnet build -->
-      <SolutionPackageZipFilePath>$(MSBuildProjectDirectory)\..\dist\$(temp_SolutionUniqueName).zip</SolutionPackageZipFilePath>
-    </PropertyGroup>
-
-  </Target>
-
-</Project>
diff --git a/solution/solution.cdsproj b/solution/solution.cdsproj
index e0a1371..1b933c7 100644
--- a/solution/solution.cdsproj
+++ b/solution/solution.cdsproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
+         Sdk="Cathal.PcfTools.Solution/1.0.0">
   <PropertyGroup>
     <PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>  
   </PropertyGroup>