diff --git a/aws-nuke.yml b/aws-nuke.yml
index 832b8b2e..8297cafc 100644
--- a/aws-nuke.yml
+++ b/aws-nuke.yml
@@ -1,4 +1,7 @@
 regions:
+  - us-east-1
+  - us-east-2
+  - us-west-1
   - us-west-2
 
 account-blacklist:
@@ -11,20 +14,28 @@ accounts:
         - cztack-ci
         - edu
       EC2SecurityGroup:
-        - type: glob
-          value: "shared-infra-cztack-ci-bastion-*"
-
-
+        - property: Name
+          type: contains
+          value: bastion
+      EC2Instance:
+        - property: "tag:env"
+          value: "cztack-ci"
 
 resource-types:
   # we can add to this over time
   targets:
-    - RDSDBCluster
-    - RDSSnapshot
-    - RDSInstance
-    - RDSDBClusterParameterGroup
-    - RDSDBParameterGroup
     - EC2Image
-    - EC2Snapshot
+    - EC2Instance
     - EC2KeyPair
     - EC2SecurityGroup
+    - EC2Snapshot
+    - EFSFileSystem
+    - EFSMountTarget
+    - ElasticacheCacheCluster
+    - IAMRole
+    - RDSDBCluster
+    - RDSDBClusterParameterGroup
+    - RDSDBParameterGroup
+    - RDSInstance
+    - RDSSnapshot
+    - S3Bucket