diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh
index 837fc61..d041db1 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -66,21 +66,19 @@ find live -name "terragrunt.hcl" -not -path "*/.terragrunt-cache/*" | sort | whi
   cat >> "$OUTPUT_FILE" << EOF
 validate-${job_prefix}:
   stage: validate
-  image: \${TERRAFORM_IMAGE_NAME}
+  image: ${TERRAFORM_IMAGE_NAME}
   variables:
     TG_ROOT: "${component_dir}"
     ENVIRONMENT: "${env}"
-    YC_FOLDER_ID: "\${${folder_var}}"
-    YC_TOKEN: "\${YC_IAM_TOKEN}"
-    S3_ACCESS_KEY: "\${S3_ACCESS_KEY}"
-    S3_SECRET_KEY: "\${S3_SECRET_KEY}"
-    S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
+    YC_FOLDER_ID: "${${folder_var}}"
+    YC_TOKEN: "${YC_IAM_TOKEN}"
+    S3_ACCESS_KEY: "${S3_ACCESS_KEY}"
+    S3_SECRET_KEY: "${S3_SECRET_KEY}"
+    S3_STATE_BUCKET: "${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
   before_script:
-    - echo "DEBUG: S3_ACCESS_KEY="${S3_ACCESS_KEY}"
-    - echo "DEBUG: S3_SECRET_KEY="${S3_SECRET_KEY}"
-    - export S3_ACCESS_KEY="${S3_ACCESS_KEY}"
-    - export S3_SECRET_KEY="${S3_SECRET_KEY}"
+    - echo "DEBUG: S3_ACCESS_KEY=\${S3_ACCESS_KEY}"
+    - echo "DEBUG: S3_SECRET_KEY=\${S3_SECRET_KEY}"
     - export AWS_EC2_METADATA_DISABLED=true
     - cd \${TG_ROOT}
   script:
@@ -99,25 +97,19 @@ EOF
   cat >> "$OUTPUT_FILE" << EOF
 plan-${job_prefix}:
   stage: plan
-  image: \${TERRAFORM_IMAGE_NAME}
+  image: ${TERRAFORM_IMAGE_NAME}
   variables:
     TG_ROOT: "${component_dir}"
     ENVIRONMENT: "${env}"
-    YC_FOLDER_ID: "\${${folder_var}}"
-    YC_TOKEN: "\${YC_IAM_TOKEN}"
-    S3_ACCESS_KEY: "\${S3_ACCESS_KEY}"
-    S3_SECRET_KEY: "\${S3_SECRET_KEY}"
-    S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
+    YC_FOLDER_ID: "${${folder_var}}"
+    YC_TOKEN: "${YC_IAM_TOKEN}"
+    S3_ACCESS_KEY: "${S3_ACCESS_KEY}"
+    S3_SECRET_KEY: "${S3_SECRET_KEY}"
+    S3_STATE_BUCKET: "${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
   before_script:
-    - echo "DEBUG: S3_ACCESS_KEY is set: \$([ -n \"\${S3_ACCESS_KEY}\" ] && echo 'YES' || echo 'NO')"
-    - echo "DEBUG: S3_SECRET_KEY is set: \$([ -n \"\${S3_SECRET_KEY}\" ] && echo 'YES' || echo 'NO')"
-    - echo "DEBUG: S3_ACCESS_KEY length: \${#S3_ACCESS_KEY}"
-    - echo "DEBUG: S3_SECRET_KEY length: \${#S3_SECRET_KEY}"
-    - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}"
-    - export S3_SECRET_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}"
-    - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}"
+    - echo "DEBUG: S3_ACCESS_KEY=\${S3_ACCESS_KEY}"
+    - echo "DEBUG: S3_SECRET_KEY=\${S3_SECRET_KEY}"
     - export AWS_EC2_METADATA_DISABLED=true
     - cd \${TG_ROOT}
   script:
@@ -147,25 +139,19 @@ EOF
   cat >> "$OUTPUT_FILE" << EOF
 apply-${job_prefix}:
   stage: apply
-  image: \${TERRAFORM_IMAGE_NAME}
+  image: ${TERRAFORM_IMAGE_NAME}
   variables:
     TG_ROOT: "${component_dir}"
     ENVIRONMENT: "${env}"
-    YC_FOLDER_ID: "\${${folder_var}}"
-    YC_TOKEN: "\${YC_IAM_TOKEN}"
-    S3_ACCESS_KEY: "\${S3_ACCESS_KEY}"
-    S3_SECRET_KEY: "\${S3_SECRET_KEY}"
-    S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
+    YC_FOLDER_ID: "${${folder_var}}"
+    YC_TOKEN: "${YC_IAM_TOKEN}"
+    S3_ACCESS_KEY: "${S3_ACCESS_KEY}"
+    S3_SECRET_KEY: "${S3_SECRET_KEY}"
+    S3_STATE_BUCKET: "${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
   before_script:
-    - echo "DEBUG: S3_ACCESS_KEY is set: \$([ -n \"\${S3_ACCESS_KEY}\" ] && echo 'YES' || echo 'NO')"
-    - echo "DEBUG: S3_SECRET_KEY is set: \$([ -n \"\${S3_SECRET_KEY}\" ] && echo 'YES' || echo 'NO')"
-    - echo "DEBUG: S3_ACCESS_KEY length: \${#S3_ACCESS_KEY}"
-    - echo "DEBUG: S3_SECRET_KEY length: \${#S3_SECRET_KEY}"
-    - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}"
-    - export S3_SECRET_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}"
-    - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}"
+    - echo "DEBUG: S3_ACCESS_KEY=\${S3_ACCESS_KEY}"
+    - echo "DEBUG: S3_SECRET_KEY=\${S3_SECRET_KEY}"
     - export AWS_EC2_METADATA_DISABLED=true
     - cd \${TG_ROOT}
   script: