diff --git a/.github/workflows/terraform-iac-ci.yml b/.github/workflows/terraform-iac-ci.yml
index 5b56e9f..890868a 100644
--- a/.github/workflows/terraform-iac-ci.yml
+++ b/.github/workflows/terraform-iac-ci.yml
@@ -17,10 +17,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        environment: [dev, stage, prod]
+        include:
+          - name: root
+            path: terraform
+          - name: dev
+            path: terraform/environments/dev
+          - name: stage
+            path: terraform/environments/stage
+          - name: prod
+            path: terraform/environments/prod
     defaults:
       run:
-        working-directory: terraform/environments/${{ matrix.environment }}
+        working-directory: ${{ matrix.path }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -31,7 +39,8 @@ jobs:
           terraform_version: 1.6.6
 
       - name: Terraform fmt
-        run: terraform fmt -check -recursive ../..
+        working-directory: .
+        run: terraform -chdir=terraform fmt -check -recursive
 
       - name: Terraform init without backend
         run: terraform init -backend=false -input=false
diff --git a/bin/app.ts b/bin/app.ts
index ac8d72d..d6d66bc 100644
--- a/bin/app.ts
+++ b/bin/app.ts
@@ -12,11 +12,12 @@ const monthlyBudgetAmount = parseMonthlyBudgetAmount(
   app.node.tryGetContext('monthlyBudgetAmount') ?? process.env.MONTHLY_BUDGET_AMOUNT,
 );
 
-new CdkAppStack(app, 'CdkAppStack', {
+new CdkAppStack(app, `CdkAppStack-${platformConfig.environment}`, {
   env: {
     account: process.env.CDK_DEFAULT_ACCOUNT,
     region: process.env.CDK_DEFAULT_REGION,
   },
+  stackName: `platform-product-${platformConfig.environment}`,
   finOps: {
     alertEmail: finOpsAlertEmail,
     monthlyBudgetAmount,