diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 09b14aa..c082b53 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -47,7 +47,7 @@ jobs:
           component: "foobar"
           stack: "plat-ue2-sandbox"
           atmos-config-path: ${{ runner.temp }}
-          atmos-version: 1.86.2
+          atmos-version: 1.99.0
 
       - uses: actions/checkout@v4
         with:
diff --git a/action.yml b/action.yml
index 7be0cfe..8b74d56 100644
--- a/action.yml
+++ b/action.yml
@@ -15,10 +15,14 @@ inputs:
     description: "Commit SHA to apply. Default: github.sha"
     required: true
     default: "${{ github.event.pull_request.head.sha }}"
+  skip-checkout:
+    description: "Disable actions/checkout. Useful for when the checkout happens in a previous step and file are modified outside of git through other actions"
+    required: false
+    default: 'false'
   atmos-version:
     description: The version of atmos to install
     required: false
-    default: ">= 1.63.0"
+    default: ">= 1.99.0"
   atmos-config-path:
     description: The path to the atmos.yaml file
     required: true
@@ -57,6 +61,7 @@ runs:
         node-version: 20
 
     - name: Checkout
+      if: ${{ inputs.skip-checkout != 'true' }}
       uses: actions/checkout@v4
 
     - name: Set atmos cli config path vars
@@ -71,63 +76,9 @@ runs:
         token: ${{ inputs.token }}
         install-wrapper: false
 
-    - name: config
-      shell: bash
-      id: config
-      run: |-
-        echo "opentofu-version=$(atmos describe config -f json | jq -r '.integrations.github.gitops["opentofu-version"]')" >> $GITHUB_OUTPUT        
-        echo "terraform-version=$(atmos describe config -f json | jq -r '.integrations.github.gitops["terraform-version"]')" >> $GITHUB_OUTPUT
-        echo "enable-infracost=$(atmos describe config -f json | jq -r '.integrations.github.gitops["infracost-enabled"]')" >> $GITHUB_OUTPUT        
-        # AWS IAM role for Terraform apply
-        echo "terraform-apply-role=$(atmos describe config -f json | jq -r '.integrations.github.gitops.role.apply')" >> $GITHUB_OUTPUT        
-        # AWS plan storage settings
-        echo "aws-region=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"].region')" >> $GITHUB_OUTPUT
-        echo "terraform-state-role=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"].role')" >> $GITHUB_OUTPUT
-        echo "terraform-state-table=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"].table')" >> $GITHUB_OUTPUT
-        echo "terraform-state-bucket=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"].bucket')" >> $GITHUB_OUTPUT        
-        # Azure plan storage settings
-        echo "plan-repository-type=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["plan-repository-type"]')" >> $GITHUB_OUTPUT        
-        echo "blob-account-name=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["blob-account-name"]')" >> $GITHUB_OUTPUT
-        echo "blob-container-name=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["blob-container-name"]')" >> $GITHUB_OUTPUT
-        echo "metadata-repository-type=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["metadata-repository-type"]')" >> $GITHUB_OUTPUT
-        echo "cosmos-container-name=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["cosmos-container-name"]')" >> $GITHUB_OUTPUT
-        echo "cosmos-database-name=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["cosmos-database-name"]')" >> $GITHUB_OUTPUT
-        echo "cosmos-endpoint=$(atmos describe config -f json | jq -r '.integrations.github.gitops["artifact-storage"]["cosmos-endpoint"]')" >> $GITHUB_OUTPUT        
-
-
-    - name: Install Terraform
-      if: ${{ steps.config.outputs.terraform-version != '' && steps.config.outputs.terraform-version != 'null' }}
-      uses: hashicorp/setup-terraform@v3
-      with:
-        terraform_version: ${{ steps.config.outputs.terraform-version }}
-        terraform_wrapper: false
-
-    - name: Install Dependencies
-      uses: cloudposse-github-actions/install-gh-releases@v1
-      with:
-        cache: true
-        config: |-
-          opentofu/opentofu: 
-            tag: ${{ startsWith(steps.config.outputs.opentofu-version, 'v') && steps.config.outputs.opentofu-version || format('v{0}', steps.config.outputs.opentofu-version) }}
-            skip: ${{ steps.config.outputs.opentofu-version == '' || steps.config.outputs.opentofu-version == 'null' }}
-          suzuki-shunsuke/tfcmt: v4.11.0
-          terraform-docs/terraform-docs: v0.18.0
-
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      if: ${{ steps.config.outputs.aws-region != '' &&
-        steps.config.outputs.aws-region != 'null' &&
-        steps.config.outputs.terraform-apply-role != '' &&
-        steps.config.outputs.terraform-apply-role != 'null' }}
-      with:
-        aws-region: ${{ steps.config.outputs.aws-region }}
-        role-to-assume: ${{ steps.config.outputs.terraform-apply-role }}
-        role-session-name: "atmos-terraform-apply-gitops"
-        mask-aws-account-id: "no"
-
     - name: Get atmos settings
-      uses: cloudposse/github-action-atmos-get-setting@v1
-      id: component
+      id: atmos-settings
+      uses: cloudposse/github-action-atmos-get-setting@v2
       with:
         settings: |
           - component: ${{ inputs.component }}
@@ -146,6 +97,102 @@ runs:
             stack: ${{ inputs.stack }}
             settingsPath: command
             outputPath: command
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.opentofu-version
+            outputPath: opentofu-version
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.terraform-version
+            outputPath: terraform-version
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.infracost-enabled
+            outputPath: enable-infracost
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.role.plan
+            outputPath: terraform-plan-role
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.role.apply
+            outputPath: terraform-apply-role
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.region
+            outputPath: aws-region
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.role
+            outputPath: terraform-state-role
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.table
+            outputPath: terraform-state-table
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.bucket
+            outputPath: terraform-state-bucket
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.plan-repository-type
+            outputPath: plan-repository-type
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.blob-account-name
+            outputPath: blob-account-name
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.blob-container-name
+            outputPath: blob-container-name
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.metadata-repository-type
+            outputPath: metadata-repository-type
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.cosmos-container-name
+            outputPath: cosmos-container-name
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.cosmos-database-name
+            outputPath: cosmos-database-name
+          - component: ${{ inputs.component }}
+            stack: ${{ inputs.stack }}
+            settingsPath: settings.integrations.github.gitops.artifact-storage.cosmos-endpoint
+            outputPath: cosmos-endpoint
+
+    - name: Install Terraform
+      if: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-version != '' && fromJson(steps.atmos-settings.outputs.settings).terraform-version != 'null' }}
+      uses: hashicorp/setup-terraform@v3
+      with:
+        terraform_version: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-version }}
+        terraform_wrapper: false
+
+    - name: Install Dependencies
+      uses: cloudposse-github-actions/install-gh-releases@v1
+      with:
+        cache: true
+        config: |-
+          opentofu/opentofu: 
+            tag: ${{ startsWith(fromJson(steps.atmos-settings.outputs.settings).opentofu-version, 'v') && fromJson(steps.atmos-settings.outputs.settings).opentofu-version || format('v{0}', fromJson(steps.atmos-settings.outputs.settings).opentofu-version) }}
+            skip: ${{ fromJson(steps.atmos-settings.outputs.settings).opentofu-version == '' || fromJson(steps.atmos-settings.outputs.settings).opentofu-version == 'null' }}
+          suzuki-shunsuke/tfcmt: v4.14.0
+          terraform-docs/terraform-docs: v0.18.0
+
+    - name: Configure Plan AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      if: ${{ fromJson(steps.atmos-settings.outputs.settings).plan-repository-type == 's3' && 
+          fromJson(steps.atmos-settings.outputs.settings).aws-region != '' &&
+          fromJson(steps.atmos-settings.outputs.settings).aws-region != 'null' &&
+          fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role != '' &&
+          fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role != 'null' }}
+      }}
+      with:
+        aws-region: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region }}
+        role-to-assume: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role }}
+        role-session-name: "atmos-terraform-apply-gitops"
+        mask-aws-account-id: "no"
 
     - name: Define Job Control State Variables
       shell: bash
@@ -157,7 +204,7 @@ runs:
     - name: Check If GitHub Actions is Enabled For Component
       shell: bash
       run: |
-        if [[ "${{ fromJson(steps.component.outputs.settings).enabled }}" == "true" ]]; then
+        if [[ "${{ fromJson(steps.atmos-settings.outputs.settings).enabled }}" == "true" ]]; then
           echo "ACTIONS_ENABLED=true" >> $GITHUB_ENV
         else
           echo "ACTIONS_ENABLED=false" >> $GITHUB_ENV
@@ -168,7 +215,7 @@ runs:
       shell: bash
       run: |-
         # Set ATMOS_BASE_PATH allow `cloudposse/utils` provider to read atmos config from the correct path 
-        ATMOS_BASE_PATH="${{ fromJson(steps.component.outputs.settings).base-path }}"
+        ATMOS_BASE_PATH="${{ fromJson(steps.atmos-settings.outputs.settings).base-path }}"
         echo "ATMOS_BASE_PATH=$(realpath ${ATMOS_BASE_PATH:-./})" >> $GITHUB_ENV
 
     - name: Define Job Variables
@@ -177,10 +224,10 @@ runs:
       shell: bash
       run: |
         STACK_NAME=$(echo "${{ inputs.stack }}" | sed 's#/#_#g')
-        COMPONENT_PATH=$( realpath ${{ fromJson(steps.component.outputs.settings).component-path }})
+        COMPONENT_PATH=$( realpath ${{ fromJson(steps.atmos-settings.outputs.settings).component-path }})
         COMPONENT_NAME=$(echo "${{ inputs.component }}" | sed 's#/#_#g')
         COMPONENT_SLUG="$STACK_NAME-$COMPONENT_NAME"
-        COMPONENT_CACHE_KEY=$(basename "${{ fromJson(steps.component.outputs.settings).component-path }}")
+        COMPONENT_CACHE_KEY=$(basename "${{ fromJson(steps.atmos-settings.outputs.settings).component-path }}")
         PLAN_FILE="${COMPONENT_PATH}/$COMPONENT_SLUG-${{ inputs.sha }}.planfile"
         LOCK_FILE="${COMPONENT_PATH}/.terraform.lock.hcl"
 
@@ -192,129 +239,72 @@ runs:
         echo "plan_file=$PLAN_FILE" >> $GITHUB_OUTPUT
         echo "lock_file=$LOCK_FILE" >> $GITHUB_OUTPUT
 
-    - name: Configure State AWS Credentials
-      if: ${{ env.ACTIONS_ENABLED == 'true' &&
-        steps.config.outputs.aws-region != '' &&
-        steps.config.outputs.aws-region != 'null' &&
-        steps.config.outputs.terraform-state-role != '' &&
-        steps.config.outputs.terraform-state-role != 'null' }}
+    - name: Configure Plan AWS Credentials
       uses: aws-actions/configure-aws-credentials@v4
+      if: ${{ env.ACTIONS_ENABLED == 'true' && 
+        fromJson(steps.atmos-settings.outputs.settings).plan-repository-type == 's3' &&
+        fromJson(steps.atmos-settings.outputs.settings).aws-region != '' &&
+        fromJson(steps.atmos-settings.outputs.settings).aws-region != 'null' &&
+        fromJson(steps.atmos-settings.outputs.settings).terraform-state-role != '' &&
+        fromJson(steps.atmos-settings.outputs.settings).terraform-state-role != 'null' }}
+      }}
       with:
-        aws-region: ${{ steps.config.outputs.aws-region }}
-        role-to-assume: ${{ steps.config.outputs.terraform-state-role }}
+        aws-region: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region }}
+        role-to-assume: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-role }}
         role-session-name: "atmos-terraform-state-gitops"
         mask-aws-account-id: "no"
 
-    - name: Retrieve Plan (AWS)
-      if: ${{ env.ACTIONS_ENABLED == 'true' &&
-        steps.config.outputs.terraform-state-table != '' &&
-        steps.config.outputs.terraform-state-table != 'null' &&
-        steps.config.outputs.terraform-state-bucket != '' &&
-        steps.config.outputs.terraform-state-bucket != 'null' }}
+    - name: Retrieve Plan
+      if: ${{ env.ACTIONS_ENABLED == 'true' }}
       uses: cloudposse/github-action-terraform-plan-storage@v1
       continue-on-error: true
       with:
         action: getPlan
-        planPath: ${{ steps.vars.outputs.plan_file }}
-        commitSHA: ${{ inputs.sha }}
-        component: ${{ inputs.component }}
-        stack: ${{ inputs.stack }}
-        tableName: ${{ steps.config.outputs.terraform-state-table }}
-        bucketName: ${{ steps.config.outputs.terraform-state-bucket }}
-
-    - name: Retrieve Lockfile (AWS)
-      if: ${{ env.ACTIONS_ENABLED == 'true' &&
-        steps.config.outputs.terraform-state-table != '' &&
-        steps.config.outputs.terraform-state-table != 'null' &&
-        steps.config.outputs.terraform-state-bucket != '' &&
-        steps.config.outputs.terraform-state-bucket != 'null' }}
-      uses: cloudposse/github-action-terraform-plan-storage@v1
-      continue-on-error: true
-      with:
-        action: getPlan
-        planPath: ${{ steps.vars.outputs.lock_file }}
         commitSHA: ${{ inputs.sha }}
-        component: ${{ inputs.component }}
-        stack: "${{ inputs.stack }}-lockfile"
-        tableName: ${{ steps.config.outputs.terraform-state-table }}
-        bucketName: ${{ steps.config.outputs.terraform-state-bucket }}
-
-    - name: Retrieve Plan (Azure)
-      if: ${{ env.ACTIONS_ENABLED == 'true' &&
-        steps.config.outputs.plan-repository-type != '' &&
-        steps.config.outputs.plan-repository-type != 'null' &&
-        steps.config.outputs.blob-account-name != '' &&
-        steps.config.outputs.blob-account-name != 'null' &&
-        steps.config.outputs.blob-container-name != '' &&
-        steps.config.outputs.blob-container-name != 'null' &&
-        steps.config.outputs.metadata-repository-type != '' &&
-        steps.config.outputs.metadata-repository-type != 'null' &&
-        steps.config.outputs.cosmos-container-name != '' &&
-        steps.config.outputs.cosmos-container-name != 'null' &&
-        steps.config.outputs.cosmos-database-name != '' &&
-        steps.config.outputs.cosmos-database-name != 'null' &&
-        steps.config.outputs.cosmos-endpoint != '' &&
-        steps.config.outputs.cosmos-endpoint != 'null' }}
-      uses: cloudposse/github-action-terraform-plan-storage@v1
-      continue-on-error: true
-      with:
-        action: getPlan
         planPath: ${{ steps.vars.outputs.plan_file }}
-        commitSHA: ${{ inputs.sha }}
         component: ${{ inputs.component }}
         stack: ${{ inputs.stack }}
-        # Azure settings
-        planRepositoryType: ${{ steps.config.outputs.plan-repository-type }}
-        blobAccountName: ${{ steps.config.outputs.blob-account-name }}
-        blobContainerName: ${{ steps.config.outputs.blob-container-name }}
-        metadataRepositoryType: ${{ steps.config.outputs.metadata-repository-type }}
-        cosmosContainerName: ${{ steps.config.outputs.cosmos-container-name }}
-        cosmosDatabaseName: ${{ steps.config.outputs.cosmos-database-name }}
-        cosmosEndpoint: ${{ steps.config.outputs.cosmos-endpoint }}
-
-    - name: Retrieve Lockfile (Azure)
-      if: ${{ env.ACTIONS_ENABLED == 'true' &&
-        steps.config.outputs.plan-repository-type != '' &&
-        steps.config.outputs.plan-repository-type != 'null' &&
-        steps.config.outputs.blob-account-name != '' &&
-        steps.config.outputs.blob-account-name != 'null' &&
-        steps.config.outputs.blob-container-name != '' &&
-        steps.config.outputs.blob-container-name != 'null' &&
-        steps.config.outputs.metadata-repository-type != '' &&
-        steps.config.outputs.metadata-repository-type != 'null' &&
-        steps.config.outputs.cosmos-container-name != '' &&
-        steps.config.outputs.cosmos-container-name != 'null' &&
-        steps.config.outputs.cosmos-database-name != '' &&
-        steps.config.outputs.cosmos-database-name != 'null' &&
-        steps.config.outputs.cosmos-endpoint != '' &&
-        steps.config.outputs.cosmos-endpoint != 'null' }}
+        planRepositoryType: ${{ fromJson(steps.atmos-settings.outputs.settings).plan-repository-type }}
+        blobAccountName: ${{ fromJson(steps.atmos-settings.outputs.settings).blob-account-name }}
+        blobContainerName: ${{ fromJson(steps.atmos-settings.outputs.settings).blob-container-name }}
+        metadataRepositoryType: ${{ fromJson(steps.atmos-settings.outputs.settings).metadata-repository-type }}
+        cosmosContainerName: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-container-name }}
+        cosmosDatabaseName: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-database-name }}
+        cosmosEndpoint: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-endpoint }}
+        tableName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-table }}
+        bucketName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-bucket }}
+
+    - name: Retrieve Lockfile
+      if: ${{ env.ACTIONS_ENABLED == 'true' }}
       uses: cloudposse/github-action-terraform-plan-storage@v1
       continue-on-error: true
       with:
         action: getPlan
-        planPath: ${{ steps.vars.outputs.lock_file }}
         commitSHA: ${{ inputs.sha }}
+        planPath: ${{ steps.vars.outputs.lock_file }}
         component: ${{ inputs.component }}
         stack: "${{ inputs.stack }}-lockfile"
-        # Azure settings
-        planRepositoryType: ${{ steps.config.outputs.plan-repository-type }}
-        blobAccountName: ${{ steps.config.outputs.blob-account-name }}
-        blobContainerName: ${{ steps.config.outputs.blob-container-name }}
-        metadataRepositoryType: ${{ steps.config.outputs.metadata-repository-type }}
-        cosmosContainerName: ${{ steps.config.outputs.cosmos-container-name }}
-        cosmosDatabaseName: ${{ steps.config.outputs.cosmos-database-name }}
-        cosmosEndpoint: ${{ steps.config.outputs.cosmos-endpoint }}
-
-    - name: Configure AWS Credentials
-      if: ${{ env.ACTIONS_ENABLED == 'true' && 
-        steps.config.outputs.aws-region != '' &&
-        steps.config.outputs.aws-region != 'null' &&
-        steps.config.outputs.terraform-apply-role != '' &&
-        steps.config.outputs.terraform-apply-role != 'null' }}
-      uses: aws-actions/configure-aws-credentials@v4.0.2
+        planRepositoryType: ${{ fromJson(steps.atmos-settings.outputs.settings).plan-repository-type }}
+        blobAccountName: ${{ fromJson(steps.atmos-settings.outputs.settings).blob-account-name }}
+        blobContainerName: ${{ fromJson(steps.atmos-settings.outputs.settings).blob-container-name }}
+        metadataRepositoryType: ${{ fromJson(steps.atmos-settings.outputs.settings).metadata-repository-type }}
+        cosmosContainerName: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-container-name }}
+        cosmosDatabaseName: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-database-name }}
+        cosmosEndpoint: ${{ fromJson(steps.atmos-settings.outputs.settings).cosmos-endpoint }}
+        tableName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-table }}
+        bucketName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-bucket }}
+
+    - name: Configure Plan AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      if: ${{ fromJson(steps.atmos-settings.outputs.settings).plan-repository-type == 's3' &&
+        fromJson(steps.atmos-settings.outputs.settings).aws-region != '' &&
+        fromJson(steps.atmos-settings.outputs.settings).aws-region != 'null' &&
+        fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role != '' &&
+        fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role != 'null' }}
+      }}
       with:
-        aws-region: ${{ steps.config.outputs.aws-region }}
-        role-to-assume: ${{ steps.config.outputs.terraform-apply-role }}
+        aws-region: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region }}
+        role-to-assume: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-apply-role }}
         role-session-name: "atmos-terraform-apply-gitops"
         mask-aws-account-id: "no"
 
@@ -322,7 +312,7 @@ runs:
       if: env.ACTIONS_ENABLED == 'true'
       shell: bash
       run: |
-        if [[ "${{ steps.config.outputs.enable-infracost }}" == "true" ]]; then
+        if [[ "${{ fromJson(steps.atmos-settings.outputs.settings).enable-infracost }}" == "true" ]]; then
           echo "INFRACOST_ENABLED=true" >> $GITHUB_ENV
         else
           echo "INFRACOST_ENABLED=false" >> $GITHUB_ENV
@@ -335,11 +325,11 @@ runs:
         api-key: ${{ inputs.infracost-api-key }}
 
     - name: Convert PLANFILE to JSON
-      if: ${{ steps.config.outputs.enable-infracost == 'true' && steps.atmos-plan.outputs.changes == 'true' }}
+      if: ${{ fromJson(steps.atmos-settings.outputs.settings).enable-infracost == 'true' && steps.atmos-plan.outputs.changes == 'true' }}
       shell: bash
       working-directory: ${{ steps.vars.outputs.component_path }}
       run: |
-        ${{ fromJson(steps.component.outputs.settings).command }} show -json "${{ steps.vars.outputs.plan_file }}" > "${{ steps.vars.outputs.plan_file }}.json"
+        ${{ fromJson(steps.atmos-settings.outputs.settings).command }} show -json "${{ steps.vars.outputs.plan_file }}" > "${{ steps.vars.outputs.plan_file }}.json"
 
     - name: Generate Infracost Diff
       if: env.INFRACOST_ENABLED == 'true'
@@ -369,7 +359,7 @@ runs:
       id: infracost-diff
       shell: bash
       run: |
-        if [[ "${{ steps.config.outputs.enable-infracost }}" == "true" ]]; then
+        if [[ "${{ fromJson(steps.atmos-settings.outputs.settings).enable-infracost }}" == "true" ]]; then
           INFRACOST_DIFF_TOTAL_MONTHLY_COST=$(cat /tmp/infracost.json | jq --raw-output .diffTotalMonthlyCost)
           INFRACOST_DETAILS_DIFF_BREAKDOWN="$(cat /tmp/infracost.txt | base64 --wrap 0)"
         else
@@ -383,7 +373,7 @@ runs:
     - name: Cache .terraform
       id: cache
       uses: actions/cache@v4
-      if: ${{ fromJson(steps.component.outputs.settings).enabled }}
+      if: ${{ fromJson(steps.atmos-settings.outputs.settings).enabled }}
       with:
         path: |
           ${{ steps.vars.outputs.component_path }}/.terraform
diff --git a/tests/opentofu/atmos.yaml b/tests/opentofu/atmos.yaml
index 39406d9..4686746 100644
--- a/tests/opentofu/atmos.yaml
+++ b/tests/opentofu/atmos.yaml
@@ -73,6 +73,8 @@ integrations:
         bucket: __STORAGE_BUCKET__
         table: __STORAGE_TABLE__
         role: __STORAGE_ROLE__
+        plan-repository-type: s3
+        metadata-repository-type: dynamo
       role:
         plan: __PLAN_ROLE__
         apply: __APPLY_ROLE__
diff --git a/tests/terraform/atmos.yaml b/tests/terraform/atmos.yaml
index 24c55f2..e4037b0 100644
--- a/tests/terraform/atmos.yaml
+++ b/tests/terraform/atmos.yaml
@@ -69,10 +69,10 @@ integrations:
         bucket: __STORAGE_BUCKET__
         table: __STORAGE_TABLE__
         role: __STORAGE_ROLE__
-        plan-repository-type:
+        plan-repository-type: s3
+        metadata-repository-type: dynamo
         blob-account-name:
         blob-container-name:
-        metadata-repository-type:
         cosmos-container-name:
         cosmos-database-name:
         cosmos-endpoint: