diff --git a/codepipeline-demo/app/config/buildspec.yml b/codepipeline-demo/app/config/buildspec.yml
index 5b4e740..e5737b5 100644
--- a/codepipeline-demo/app/config/buildspec.yml
+++ b/codepipeline-demo/app/config/buildspec.yml
@@ -10,10 +10,11 @@ phases:
   post_build:
     commands:
       # push
+      - docker tag $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:latest
       - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION
+      - docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:latest
       # create new task definition
       - ./create-new-task-def.sh $IMAGE_REPO_NAME
-      - ./set-network-configuration.sh $IMAGE_REPO_NAME
 
 artifacts:
   files:
diff --git a/codepipeline-demo/app/scripts/create-new-task-def.sh b/codepipeline-demo/app/scripts/create-new-task-def.sh
index 8d4ede2..782841c 100755
--- a/codepipeline-demo/app/scripts/create-new-task-def.sh
+++ b/codepipeline-demo/app/scripts/create-new-task-def.sh
@@ -15,4 +15,3 @@ REQUIRES_COMPATIBILITIES=$(echo $CURRENT_TASKDEF |jq '.taskDefinition.requiresCo
 echo '{"family": "'${SERVICE_NAME}'", "taskRoleArn": "'${TASKDEF_ROLE_ARN}'", "executionRoleArn": "'${EXECUTION_ROLE_ARN}'", "containerDefinitions": '$TASKDEF', "cpu": "'$CPU'", "memory": "'$MEMORY'", "requiresCompatibilities": ['$REQUIRES_COMPATIBILITIES'], "networkMode": "'${NETWORK_MODE}'" }' > taskdef.json
 #aws ecs register-task-definition --cli-input-json file://task-def-template.json.new > task-def-template.json.out
 #NEW_TASKDEF_ARN=`cat task-def-template.json.out |jq -r '.taskDefinition.taskDefinitionArn'`
-sed -i 's#$TASKDEF#'$NEW_TASKDEF_ARN'#' appspec.yaml
diff --git a/codepipeline-demo/codebuild.tf b/codepipeline-demo/codebuild.tf
index 47e3847..2fc01eb 100644
--- a/codepipeline-demo/codebuild.tf
+++ b/codepipeline-demo/codebuild.tf
@@ -10,10 +10,10 @@ resource "aws_codebuild_project" "demo" {
     type = "CODEPIPELINE"
   }
 
-  cache {
-    type     = "S3"
-    location = aws_s3_bucket.codebuild-cache.bucket
-  }
+  #cache {
+  #  type     = "S3"
+  #  location = aws_s3_bucket.codebuild-cache.bucket
+  #}
 
   environment {
     compute_type    = "BUILD_GENERAL1_SMALL"
@@ -39,5 +39,7 @@ resource "aws_codebuild_project" "demo" {
     type      = "CODEPIPELINE"
     buildspec = "buildspec.yml"
   }
+
+  #depends_on      = [aws_s3_bucket.codebuild-cache]
 }
 
diff --git a/codepipeline-demo/fargate-service.tf b/codepipeline-demo/fargate-service.tf
index e6ec0c9..bd5eabd 100644
--- a/codepipeline-demo/fargate-service.tf
+++ b/codepipeline-demo/fargate-service.tf
@@ -28,7 +28,8 @@ resource "aws_ecs_task_definition" "demo" {
      "healthCheck": {
        "command": [ "CMD-SHELL", "curl -f http://localhost:3000/ || exit 1" ],
        "interval": 30,
-       "retries": 3
+       "retries": 3,
+       "timeout": 5
      }, 
      "portMappings": [
         {