diff --git a/Dockerfile b/Dockerfile
index 6a61202..5803660 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,13 @@ FROM alpine:latest
 
 RUN apk add --no-cache curl unzip bash git
 
-ARG TERRAFORM_VERSION=1.14.3
+ARG TERRAFORM_VERSION=1.5.7
 RUN curl -fsSL https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -o terraform.zip && \
     unzip terraform.zip -d /usr/local/bin/ && \
     chmod +x /usr/local/bin/terraform && \
     rm -f terraform.zip
 
-ARG TERRAGRUNT_VERSION=0.98.0
+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
 
diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh
index 0c5dfd9..3770a7f 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -76,7 +76,6 @@ validate-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
-    TF_WORKSPACE: "default"
   before_script:
     - cd \${TG_ROOT}
   script:
@@ -105,7 +104,6 @@ plan-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
-    TF_WORKSPACE: "default"
   before_script:
     - cd \${TG_ROOT}
   script:
@@ -145,7 +143,6 @@ apply-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
-    TF_WORKSPACE: "default"
   before_script:
     - cd \${TG_ROOT}
   script: