diff --git a/live/stage/secrets/terragrunt.hcl b/live/stage/secrets/terragrunt.hcl
index d983099..d1ab33f 100644
--- a/live/stage/secrets/terragrunt.hcl
+++ b/live/stage/secrets/terragrunt.hcl
@@ -18,6 +18,7 @@ dependency "namespace" {
     names = ["pulse", "block-analyzer"]
   }
   mock_outputs_allowed_terraform_commands = ["init", "validate", "plan"]
+  skip_outputs = get_env("TG_SKIP_DEPENDENCY_OUTPUTS", "false") == "true"
 }
 
 dependency "s3" {
@@ -28,6 +29,7 @@ dependency "s3" {
     secret_key  = "mock-secret-key"
   }
   mock_outputs_allowed_terraform_commands = ["init", "validate", "plan"]
+  skip_outputs = get_env("TG_SKIP_DEPENDENCY_OUTPUTS", "false") == "true"
 }
 
 dependency "database" {
@@ -49,6 +51,7 @@ dependency "database" {
     }
   }
   mock_outputs_allowed_terraform_commands = ["init", "validate", "plan"]
+  skip_outputs = get_env("TG_SKIP_DEPENDENCY_OUTPUTS", "false") == "true"
 }
 
 locals {
diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh
index 879ec02..002ea8a 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -13,7 +13,7 @@ variables:
   AWS_EC2_METADATA_DISABLED: "true"
   TF_CLI_ARGS: "-no-color"
   TG_LOG_LEVEL: "error"
-  TERRAGRUNT_FETCH_DEPENDENCY_OUTPUT_FROM_STATE: "true"
+  TG_DEPENDENCY_FETCH_OUTPUT_FROM_STATE: "true"
 
 stages:
   - validate
@@ -63,6 +63,7 @@ validate-${job_prefix}:
     TG_ROOT: "${full_component_dir}"
     ENVIRONMENT: "${env}"
     YC_FOLDER_ID: "\$${folder_var}"
+    TG_SKIP_DEPENDENCY_OUTPUTS: "true"
   before_script:
     - cd \$TG_ROOT
     - echo "Working directory:" && pwd
@@ -93,6 +94,7 @@ plan-${job_prefix}:
     TG_ROOT: "${full_component_dir}"
     ENVIRONMENT: "${env}"
     YC_FOLDER_ID: "\$${folder_var}"
+    TG_SKIP_DEPENDENCY_OUTPUTS: "true"
   needs:
     - validate-${job_prefix}
   before_script:
@@ -138,6 +140,7 @@ apply-${job_prefix}:
     TG_ROOT: "${full_component_dir}"
     ENVIRONMENT: "${env}"
     YC_FOLDER_ID: "\$${folder_var}"
+    TG_SKIP_DEPENDENCY_OUTPUTS: "false"
   needs:
     - ${apply_needs}
   before_script: