diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 53df0a8..74a7b98 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,11 +16,12 @@ on:
 permissions: write-all
 jobs:
   build:
-    uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v6.2
+    uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v7.0
     with:
       hasTests: true
       useMtpRunner: true
-      testDirectory: "test"
+      enableCodeCoverage: true
+      coverageThreshold: 80
       dotnet-version: |
         8.0.x
         9.0.x
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 450f861..a09e985 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -7,12 +7,13 @@ on:
 permissions: write-all
 jobs:
   build:
-    uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v6.2
+    uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v7.0
     with:
       solution: LayeredCraft.Cdk.Constructs.slnx
       hasTests: true
       useMtpRunner: true
-      testDirectory: "test"
+      enableCodeCoverage: true
+      coverageThreshold: 80
       dotnetVersion: |
         8.0.x
         9.0.x
diff --git a/Directory.Build.props b/Directory.Build.props
index 61f7e18..c68bd1a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>2.1.4</VersionPrefix>
+        <VersionPrefix>2.1.5</VersionPrefix>
         <!-- SPDX license identifier for MIT -->
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 10d9ff9..b5f2384 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup Label="Build">
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
   </ItemGroup>
   <ItemGroup Label="AWS">
     <PackageVersion Include="Amazon.CDK.Lib" Version="2.238.0" />
@@ -12,7 +13,7 @@
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
-    <PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
+    <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
diff --git a/LayeredCraft.Cdk.Constructs.slnx b/LayeredCraft.Cdk.Constructs.slnx
index 19ad064..06187cc 100644
--- a/LayeredCraft.Cdk.Constructs.slnx
+++ b/LayeredCraft.Cdk.Constructs.slnx
@@ -32,6 +32,7 @@
     <File Path="CLAUDE.md" />
     <File Path="Directory.Build.props" />
     <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
     <File Path="LICENSE" />
     <File Path="README.md" />
   </Folder>
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..3140116
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}
diff --git a/src/LayeredCraft.Cdk.Constructs/StaticSiteConstruct.cs b/src/LayeredCraft.Cdk.Constructs/StaticSiteConstruct.cs
index 33781d0..81aa0de 100644
--- a/src/LayeredCraft.Cdk.Constructs/StaticSiteConstruct.cs
+++ b/src/LayeredCraft.Cdk.Constructs/StaticSiteConstruct.cs
@@ -100,17 +100,22 @@ public StaticSiteConstruct(Construct scope, string id, IStaticSiteConstructProps
         // Add API proxying behavior if API domain is specified
         if (!string.IsNullOrWhiteSpace(props.ApiDomain))
         {
-            distribution.AddBehavior("/api/*", new HttpOrigin(props.ApiDomain, new HttpOriginProps
+            var apiOrigin = new HttpOrigin(props.ApiDomain, new HttpOriginProps
             {
                 ProtocolPolicy = OriginProtocolPolicy.HTTPS_ONLY
-            }), new BehaviorOptions
+            });
+
+            var apiBehaviorOptions = new BehaviorOptions
             {
                 AllowedMethods = AllowedMethods.ALLOW_ALL,
                 CachePolicy = CachePolicy.CACHING_DISABLED,
                 OriginRequestPolicy = OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
                 ViewerProtocolPolicy = ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                 Compress = true
-            });
+            };
+
+            distribution.AddBehavior("/api", apiOrigin, apiBehaviorOptions);
+            distribution.AddBehavior("/api/*", apiOrigin, apiBehaviorOptions);
         }
         
         // Create primary DNS A record for the site domain
diff --git a/test/LayeredCraft.Cdk.Constructs.Tests/LayeredCraft.Cdk.Constructs.Tests.csproj b/test/LayeredCraft.Cdk.Constructs.Tests/LayeredCraft.Cdk.Constructs.Tests.csproj
index 18a1302..546c131 100644
--- a/test/LayeredCraft.Cdk.Constructs.Tests/LayeredCraft.Cdk.Constructs.Tests.csproj
+++ b/test/LayeredCraft.Cdk.Constructs.Tests/LayeredCraft.Cdk.Constructs.Tests.csproj
@@ -35,6 +35,7 @@
         <PackageReference Include="AutoFixture.Xunit3"/>
         <PackageReference Include="AwesomeAssertions" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
         <PackageReference Include="NSubstitute"/>
         <PackageReference Include="xunit.v3.mtp-v2" />
         <PackageReference Include="xunit.runner.visualstudio">