diff --git a/Makefile b/Makefile
index 434f5ec..c2e9eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,6 @@ destroy:
 clean:
 	@echo "==> Force-deleting Secrets Manager secret..."
 	-aws secretsmanager delete-secret --secret-id $(SECRET) --force-delete-without-recovery 2>/dev/null || true
-	@echo "==> Emptying S3 buckets..."
-	-aws s3 rm s3://dumpnet-logs --recursive 2>/dev/null || true
-	-aws s3 rm s3://dumpnet-athena-results --recursive 2>/dev/null || true
 	@echo "==> Clearing stale kubeconfig contexts..."
 	-kubectl config delete-context admin@dumpnet 2>/dev/null || true
 	-kubectl config delete-cluster dumpnet 2>/dev/null || true
diff --git a/charts/cert-manager/Chart.yaml b/charts/cert-manager/Chart.yaml
new file mode 100644
index 0000000..e172076
--- /dev/null
+++ b/charts/cert-manager/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+name: cert-manager-issuers
+description: cert-manager ClusterIssuer resources
+type: application
+version: 0.1.0
diff --git a/terraform/logging.tf b/terraform/logging.tf
index 28f6ed3..c2215db 100644
--- a/terraform/logging.tf
+++ b/terraform/logging.tf
@@ -1,6 +1,7 @@
 # S3 bucket for logs
 resource "aws_s3_bucket" "logs" {
-  bucket = "${var.cluster_name}-logs"
+  bucket        = "${var.cluster_name}-logs"
+  force_destroy = true
 }
 
 resource "aws_s3_bucket_lifecycle_configuration" "logs" {
@@ -41,7 +42,8 @@ resource "aws_athena_database" "logs" {
 }
 
 resource "aws_s3_bucket" "athena_results" {
-  bucket = "${var.cluster_name}-athena-results"
+  bucket        = "${var.cluster_name}-athena-results"
+  force_destroy = true
 }
 
 resource "aws_athena_workgroup" "logs" {