diff --git a/buildspecs/terragrunt.yml b/buildspecs/terragrunt.yml
index 4e3b74c..313f7f1 100644
--- a/buildspecs/terragrunt.yml
+++ b/buildspecs/terragrunt.yml
@@ -7,7 +7,7 @@ env:
     PROXY_CONFIG: ${PROXY_CONFIG}
     REQUIRED_TOOLS: "terraform terragrunt"
     TOOL_DEFINITIONS: ${TOOL_DEFINITIONS}
-    TOOLS_DIR: "/tmp/build-tools"
+    TOOLS_DIR: "$CODEBUILD_SRC_DIR/.tool_cache"
   exported-variables:
     - TERRAGRUNT_PATH
 
@@ -39,7 +39,6 @@ phases:
         MANAGE_TOOLS_SCRIPT_S3_KEY="tools/scripts/manage_tools.sh"
         LOCAL_SCRIPT_PATH="${TOOLS_DIR}/manage_tools.sh"
 
-      - |
         if [ ! -f "$LOCAL_SCRIPT_PATH" ]; then
           echo "Downloading Tools Script from S3 ${ARTIFACT_BUCKET}...."
           aws s3 cp s3://${ARTIFACT_BUCKET}/$MANAGE_TOOLS_SCRIPT_S3_KEY $LOCAL_SCRIPT_PATH
@@ -52,8 +51,8 @@ phases:
 
       - export PATH=$TOOLS_DIR/bin:$PATH
       - aws sts get-caller-identity
-      - terraform --version
       - terragrunt --version
+      - terraform --version
 
   build:
     commands: