diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 828619a..994bdbd 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -2,12 +2,6 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "demaconsulting.spdxtool": {
-      "version": "2.6.0",
-      "commands": [
-        "spdx-tool"
-      ]
-    },
     "dotnet-sonarscanner": {
       "version": "11.0.0",
       "commands": [
diff --git a/src/DemaConsulting.ReqStream/DemaConsulting.ReqStream.csproj b/src/DemaConsulting.ReqStream/DemaConsulting.ReqStream.csproj
index 4b1c200..aba0bf4 100644
--- a/src/DemaConsulting.ReqStream/DemaConsulting.ReqStream.csproj
+++ b/src/DemaConsulting.ReqStream/DemaConsulting.ReqStream.csproj
@@ -31,12 +31,19 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
+    
+    <!-- SBOM Configuration -->
+    <GenerateSBOM>true</GenerateSBOM>
+    <SBOMPackageName>$(PackageId)</SBOMPackageName>
+    <SBOMPackageVersion>$(Version)</SBOMPackageVersion>
+    <SBOMPackageSupplier>Organization: $(Company)</SBOMPackageSupplier>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="DemaConsulting.TestResults" Version="1.2.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
+    <PackageReference Include="Microsoft.Sbom.Targets" Version="2.2.8" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>