diff --git a/Dockerfile b/Dockerfile
index 5f0d546..6ff21c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/uceap/devcontainer-drupal:v2.3.0
+FROM ghcr.io/uceap/devcontainer-drupal:main
 
 # Install SSH server
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -10,7 +10,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 COPY docker-uceap-entrypoint /usr/local/bin/docker-uceap-entrypoint
 ENTRYPOINT ["docker-uceap-entrypoint"]
 
-COPY build /var/www/build
 COPY config /var/www/config
 COPY composer.json /var/www/
 COPY web /var/www/web
diff --git a/terraform/alb.tf b/terraform/alb.tf
index 50f5582..6b11251 100644
--- a/terraform/alb.tf
+++ b/terraform/alb.tf
@@ -1,6 +1,7 @@
 # S3 Bucket for ALB Access Logs
 resource "aws_s3_bucket" "alb_logs" {
   bucket_prefix = "${var.name_prefix}-alb-logs-"
+  force_destroy = true
 
   tags = {
     Name = "${var.name_prefix}-alb-logs-bucket"
diff --git a/terraform/ecs.tf b/terraform/ecs.tf
index 7530e1d..6d26dfb 100644
--- a/terraform/ecs.tf
+++ b/terraform/ecs.tf
@@ -2,6 +2,7 @@
 resource "aws_ecr_repository" "drupal" {
   name                 = "${var.name_prefix}-drupal"
   image_tag_mutability = "MUTABLE"
+  force_delete         = true
 
   image_scanning_configuration {
     scan_on_push = true