diff --git a/docs/how/delete-metadata.md b/docs/how/delete-metadata.md
index aa5a720640..62fdeb052a 100644
--- a/docs/how/delete-metadata.md
+++ b/docs/how/delete-metadata.md
@@ -61,6 +61,11 @@ _Note: All these commands below support the soft-delete option (`-s/--soft`) as
 datahub delete --env DEV --entity_type dataset
 ```
 
+### Delete all containers for a particular platform
+```
+datahub delete --entity_type container --platform s3
+```
+
 ### Delete all Pipelines and Tasks in the DEV environment
 ```
 datahub delete --env DEV --entity_type "datajob"
diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index e9739891a3..ffd6da2b1c 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -352,9 +352,9 @@ def get_urns_by_filter(
     endpoint: str = "/entities?action=search"
     url = gms_host + endpoint
     filter_criteria = []
-    if env:
-        filter_criteria.append({"field": "origin", "value": env, "condition": "EQUAL"})
     entity_type_lower = entity_type.lower()
+    if env and entity_type_lower != "container":
+        filter_criteria.append({"field": "origin", "value": env, "condition": "EQUAL"})
     if (
         platform is not None
         and entity_type_lower == "dataset"