diff --git a/1es-azure-pipeline.yml b/1es-azure-pipeline.yml
index 51358f66..0da58f76 100644
--- a/1es-azure-pipeline.yml
+++ b/1es-azure-pipeline.yml
@@ -54,6 +54,8 @@ extends:
         name: NetCore1ESPool-Internal
         image: 1es-windows-2022
         os: windows
+      sbom:
+        enabled: false # SBOM requires a special setup for node.js projects to ensure all dependencies are included.
       policheck:
         enabled: true
         exclusionsFile: $(System.DefaultWorkingDirectory)\PoliCheckExclusions.xml
@@ -89,3 +91,10 @@ extends:
             image: 1es-windows-2022
             os: windows
           useOneEngineeringPool: true
+      - template: pipeline-templates/sbom.yaml@self
+        parameters:
+          pool:
+            name: NetCore1ESPool-Internal
+            image: 1es-windows-2022
+            os: windows
+          useOneEngineeringPool: true
diff --git a/pipeline-templates/sbom.yaml b/pipeline-templates/sbom.yaml
new file mode 100644
index 00000000..e5403cce
--- /dev/null
+++ b/pipeline-templates/sbom.yaml
@@ -0,0 +1,25 @@
+parameters:
+  pool: ''
+
+jobs:
+- job: SBOM
+  pool:
+    ${{ if eq(parameters.useOneEngineeringPool, 'true') }}:
+      ${{ parameters.pool }}
+    ${{ else }}:
+      vmImage: ${{ parameters.pool.vmImage }}
+  displayName: 📝 SBOM Generation
+  dependsOn:
+  - ${{ parameters.pool.os }}_Build
+  - ${{ parameters.pool.os }}_Package
+  steps:
+    - task: ManifestGeneratorTask@0
+      displayName: 📃 SBOM generation
+      inputs:
+        BuildDropPath: $(System.DefaultWorkingDirectory)
+  templateContext:
+    outputs:
+    - output: pipelineArtifact
+      displayName: 📢 Publishing SBOM
+      artifact: SBOM
+      targetPath: $(System.DefaultWorkingDirectory)/_manifest
\ No newline at end of file
diff --git a/vscode-dotnet-runtime-library/src/test/unit/LoggingObserver.test.ts b/vscode-dotnet-runtime-library/src/test/unit/LoggingObserver.test.ts
index 52808d5e..bb3284e8 100644
--- a/vscode-dotnet-runtime-library/src/test/unit/LoggingObserver.test.ts
+++ b/vscode-dotnet-runtime-library/src/test/unit/LoggingObserver.test.ts
@@ -33,5 +33,5 @@ suite('LoggingObserver Unit Tests', () => {
             assert.include(logContent, fakeEvent.eventName, 'The log file does not contain the expected content that should be written to it');
         });
 
-    }).timeout(4000);
+    }).timeout(10000);
 });