diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e30005d..5924945 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - trigger
 
 variables:
-  TERRAFORM_IMAGE_NAME: cr.yandex/crp3ccidau046kdj8g9q/terraform/terragrunt:v0.9.9
+  TERRAFORM_IMAGE_NAME: cr.yandex/crp3ccidau046kdj8g9q/terraform/terragrunt:v9.9
 
 generate-pipeline:
   stage: generate
diff --git a/Dockerfile b/Dockerfile
index ce0d7d0..b6417ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,8 @@ ARG TERRAGRUNT_VERSION=0.93.11
 RUN curl -fsSL https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 -o /usr/local/bin/terragrunt && \
     chmod +x /usr/local/bin/terragrunt
 
-# Create plugin cache directory - Terraform will download providers here from Yandex mirror
-RUN mkdir -p /root/.terraform.d/plugin-cache
-
-# Configure Terraform to use Yandex Terraform registry mirror
-RUN mkdir -p /root/.terraform.d && \
+RUN mkdir -p /root/.terraform.d/plugin-cache && \
+    mkdir -p /root/.terraform.d && \
     echo 'provider_installation {' > /root/.terraformrc && \
     echo '  network_mirror {' >> /root/.terraformrc && \
     echo '    url = "https://terraform-mirror.yandexcloud.net/"' >> /root/.terraformrc && \
diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh
index c9f8f87..19272b1 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -91,11 +91,10 @@ validate-${job_prefix}:
     - cd \${TG_ROOT}
     - ls -la
     - rm -rf .terragrunt-cache
-    - export TF_PLUGIN_CACHE_DIR=/root/.terraform.d/plugins
+    - export TF_PLUGIN_CACHE_DIR=/root/.terraform.d/plugin-cache
   script:
     - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found"
     - terragrunt init -reconfigure
-    - terragrunt validate-inputs
     - terragrunt validate
   rules:
     - if: '\$CI_PIPELINE_SOURCE == "merge_request_event"'
@@ -129,12 +128,7 @@ plan-${job_prefix}:
     - ls -la
     - rm -rf .terragrunt-cache
   script:
-    - terragrunt init -reconfigure || true
-    - echo "=== Checking generated backend.tf ==="
-    - find .terragrunt-cache -name "backend.tf" -exec echo "=== {} ===" \; -exec head -15 {} \; 2>/dev/null || echo "No backend.tf found"
-    - echo "=== Environment variables ==="
-    - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found"
-    - exit 1
+    - terragrunt init -reconfigure
     - terragrunt plan -out=tfplan
   rules:
     - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"'
@@ -181,11 +175,6 @@ apply-${job_prefix}:
     - rm -rf .terragrunt-cache
   script:
     - terragrunt init -reconfigure || true
-    - echo "=== Checking generated backend.tf ==="
-    - find .terragrunt-cache -name "backend.tf" -exec echo "=== {} ===" \; -exec head -15 {} \; 2>/dev/null || echo "No backend.tf found"
-    - echo "=== Environment variables ==="
-    - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found"
-    - exit 1
     - terragrunt apply tfplan
   rules:
     - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"'