diff --git a/.buildkite/configs/cleanup.aws.yml b/.buildkite/configs/cleanup.aws.yml
index 911d6bb620..5d24a78b76 100644
--- a/.buildkite/configs/cleanup.aws.yml
+++ b/.buildkite/configs/cleanup.aws.yml
@@ -40,17 +40,18 @@ scanners:
           - us-east-1
         filters:
           - type: "<"
-            pointer: "/created_at"
+            pointer: "/extra/creation_date"
             param: "${CREATION_DATE}"
             converters:
               param: "date"
               value: "date"
-          - type: "regex"
-            pointer: "/extra/tags/repo"
-            param: "^(elastic-package|integrations)"
-          - type: "="
-            pointer: "/extra/tags/environment"
-            param: "ci"
+          # It looks like tags are not reported by cloud-reaper for buckets
+          # - type: "regex"
+          #   pointer: "/extra/tags/repo"
+          #   param: "^(elastic-package|integrations)"
+          # - type: "="
+          #   pointer: "/extra/tags/environment"
+          #   param: "ci"
           - type: "regex"
             pointer: "/name"
             param: "^elastic-package-(.*)"