From 144843437f3d3c51dbdf980808f3587a05f929a1 Mon Sep 17 00:00:00 2001
From: Michael Bloch <michael.bloch@shinesolutions.com>
Date: Mon, 14 Aug 2023 10:56:34 +1000
Subject: [PATCH] Enable deletion of CloudWatch Loggroups

---
 .../aem-consolidated-amazon-linux2-aem64-jdk8/sandpit.yaml      | 2 ++
 .../aem-consolidated-amazon-linux2-aem65-jdk11-sh/sandpit.yaml  | 2 ++
 .../aem-consolidated-amazon-linux2-aem65-jdk11/sandpit.yaml     | 2 ++
 .../aem-consolidated-amazon-linux2-aem65-jdk8/sandpit.yaml      | 2 ++
 .../aem-consolidated-rhel7-aem64-jdk8/sandpit.yaml              | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk11-ap/sandpit.yaml          | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk11-sh-saml/sandpit.yaml     | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk11-sh/sandpit.yaml          | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk11/sandpit.yaml             | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk8-nb/sandpit.yaml           | 2 ++
 .../aem-consolidated-rhel7-aem65-jdk8/sandpit.yaml              | 2 ++
 .../aem-full-set-amazon-linux2-aem64-jdk8/sandpit.yaml          | 2 ++
 .../aem-full-set-amazon-linux2-aem65-jdk11-sh/sandpit.yaml      | 2 ++
 .../aem-full-set-amazon-linux2-aem65-jdk11/sandpit.yaml         | 2 ++
 .../aem-full-set-amazon-linux2-aem65-jdk8/sandpit.yaml          | 2 ++
 .../aem-full-set-preview-amazon-linux2-aem65-jdk11/sandpit.yaml | 2 ++
 .../aem-full-set-preview-amazon-linux2-aem65-jdk8/sandpit.yaml  | 2 ++
 .../aem-full-set-preview-rhel7-aem65-jdk11-sh/sandpit.yaml      | 2 ++
 .../aem-full-set-preview-rhel7-aem65-jdk11/sandpit.yaml         | 2 ++
 .../aem-full-set-preview-rhel7-aem65-jdk8-nb/sandpit.yaml       | 2 ++
 .../aem-full-set-preview-rhel7-aem65-jdk8-sh/sandpit.yaml       | 2 ++
 .../aem-full-set-preview-rhel7-aem65-jdk8/sandpit.yaml          | 2 ++
 .../aem-full-set-rhel7-aem64-jdk8/sandpit.yaml                  | 2 ++
 .../aem-full-set-rhel7-aem65-jdk11-ap/sandpit.yaml              | 2 ++
 .../aem-full-set-rhel7-aem65-jdk11-sh/sandpit.yaml              | 2 ++
 .../aem-full-set-rhel7-aem65-jdk11/sandpit.yaml                 | 2 ++
 .../aem-full-set-rhel7-aem65-jdk8-nb/sandpit.yaml               | 2 ++
 .../aem-full-set-rhel7-aem65-jdk8/sandpit.yaml                  | 2 ++
 aem-aws-stack-builder/aem-stack-manager-sandpit/sandpit.yaml    | 2 ++
 aem-aws-stack-builder/cdn-sandpit/sandpit.yaml                  | 2 ++
 aem-aws-stack-builder/src/common/sandpit.yaml                   | 2 ++
 31 files changed, 62 insertions(+)

diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11-sh/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-ap/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-ap/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-ap/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-ap/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11-sh/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-ap/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-ap/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-ap/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-ap/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-sh/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-sh/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-sh/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11-sh/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/sandpit.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/aem-stack-manager-sandpit/sandpit.yaml b/aem-aws-stack-builder/aem-stack-manager-sandpit/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/aem-stack-manager-sandpit/sandpit.yaml
+++ b/aem-aws-stack-builder/aem-stack-manager-sandpit/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/cdn-sandpit/sandpit.yaml b/aem-aws-stack-builder/cdn-sandpit/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/cdn-sandpit/sandpit.yaml
+++ b/aem-aws-stack-builder/cdn-sandpit/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project
diff --git a/aem-aws-stack-builder/src/common/sandpit.yaml b/aem-aws-stack-builder/src/common/sandpit.yaml
index 81ca526a..07fc93d2 100644
--- a/aem-aws-stack-builder/src/common/sandpit.yaml
+++ b/aem-aws-stack-builder/src/common/sandpit.yaml
@@ -2,6 +2,8 @@
 aws:
   region: ap-southeast-2
   availability_zone_list: ap-southeast-2a, ap-southeast-2b, ap-southeast-2c
+  cloudwatch:
+    enable_cloudwatch_cleanup: true
 
   tags:
     - Key: Project