diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 88e93f050..56d03049b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -37,19 +37,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-changes-exists-drift.yml b/.github/workflows/test-changes-exists-drift.yml
index 93598788c..6e5770301 100644
--- a/.github/workflows/test-changes-exists-drift.yml
+++ b/.github/workflows/test-changes-exists-drift.yml
@@ -30,7 +30,7 @@ jobs:
       - shell: bash
         run: |
           mkdir -p ${{ runner.temp }}
-          cp ./tests/terraform/atmos.yaml ${{ runner.temp }}/atmos.yaml
+          cp ./tests/opentofu/atmos.yaml ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__INFRACOST_ENABLED__#false#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__STORAGE_REGION__#${{ env.AWS_REGION }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g' ${{ runner.temp }}/atmos.yaml
@@ -53,19 +53,6 @@ jobs:
           fi
           done
 
-          for file in ./tests/terraform/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
 
       - name: Plan Atmos Component
         id: current
diff --git a/.github/workflows/test-changes-exists.yml b/.github/workflows/test-changes-exists.yml
index c5b8fd7a3..d4a3b0fda 100644
--- a/.github/workflows/test-changes-exists.yml
+++ b/.github/workflows/test-changes-exists.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-failed-plan-drift.yml b/.github/workflows/test-failed-plan-drift.yml
index 355e22ae0..1590ce45b 100644
--- a/.github/workflows/test-failed-plan-drift.yml
+++ b/.github/workflows/test-failed-plan-drift.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-failed-plan.yml b/.github/workflows/test-failed-plan.yml
index 7efd1d0fc..54f744d40 100644
--- a/.github/workflows/test-failed-plan.yml
+++ b/.github/workflows/test-failed-plan.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-infra-cost.yml b/.github/workflows/test-infra-cost.yml
index 547b04caa..ff62db8cd 100644
--- a/.github/workflows/test-infra-cost.yml
+++ b/.github/workflows/test-infra-cost.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-no-changes-drift-more.yml b/.github/workflows/test-no-changes-drift-more.yml
index 7567dd703..c06b67e55 100644
--- a/.github/workflows/test-no-changes-drift-more.yml
+++ b/.github/workflows/test-no-changes-drift-more.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-no-changes.yml b/.github/workflows/test-no-changes.yml
index 6c644706f..30384d860 100644
--- a/.github/workflows/test-no-changes.yml
+++ b/.github/workflows/test-no-changes.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-settings-action-disabled-drift.yml b/.github/workflows/test-settings-action-disabled-drift.yml
index 8876fe608..4a5118e0b 100644
--- a/.github/workflows/test-settings-action-disabled-drift.yml
+++ b/.github/workflows/test-settings-action-disabled-drift.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
diff --git a/.github/workflows/test-settings-action-disabled.yml b/.github/workflows/test-settings-action-disabled.yml
index c3732d93e..b005408e6 100644
--- a/.github/workflows/test-settings-action-disabled.yml
+++ b/.github/workflows/test-settings-action-disabled.yml
@@ -40,19 +40,6 @@ jobs:
           sed -i -e 's#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
           sed -i -e 's#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g' ${{ runner.temp }}/atmos.yaml
 
-          for file in ./tests/opentofu/stacks/catalog/*.yaml; do
-          if [ -f "$file" ]; then
-            sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"
-            sed -i -e "s#__STORAGE_REGION__#${{ env.AWS_REGION }}#g" "$file"          
-            sed -i -e "s#__STORAGE_BUCKET__#${{ secrets.TERRAFORM_STATE_BUCKET }}#g" "$file"
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"          
-            sed -i -e "s#__STORAGE_TABLE__#${{ secrets.TERRAFORM_STATE_TABLE }}#g" "$file"
-            sed -i -e "s#__STORAGE_ROLE__#${{ secrets.TERRAFORM_STATE_ROLE }}#g" "$file"
-            sed -i -e "s#__PLAN_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-            sed -i -e "s#__APPLY_ROLE__#${{ secrets.TERRAFORM_PLAN_ROLE }}#g" "$file"
-          fi
-          done
-
           for file in ./tests/terraform/stacks/catalog/*.yaml; do
           if [ -f "$file" ]; then
             sed -i -e "s#__INFRACOST_ENABLED__#false#g" "$file"