diff --git a/README.md b/README.md
index 6dbef90..dbc57b5 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,10 @@ Besides, the attachment location should be set to `swift` (this is
 automatically done by the `install` methods of the `cloud_platform` module).
  * `ir.config_parameter` `ir_attachment.location`: `swift`
 
+Structure of container name is checked against environment.
+It is possible to by-pass this behavior by using the following environment variable:
+`SWIFT_WRITE_CONTAINER_UNSTRUCTURED`.
+
 ### Sessions in Redis
 
 * prod:
diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py
index 6b37b96..f9a8476 100644
--- a/cloud_platform/models/cloud_platform.py
+++ b/cloud_platform/models/cloud_platform.py
@@ -112,6 +112,13 @@ class CloudPlatform(models.AbstractModel):
             )
             prod_container = bool(re.match(r'[a-z0-9-]+-odoo-prod',
                                            container_name))
+            # A bucket name is defined under the following format
+            # <client>-odoo-<env>
+            #
+            # Use SWIFT_WRITE_CONTAINER_UNSTRUCTURED to by-pass check on bucket name
+            # structure
+            if os.environ.get('SWIFT_WRITE_CONTAINER_UNSTRUCTURED'):
+                return
             if environment_name == 'prod':
                 assert prod_container, (
                     "SWIFT_WRITE_CONTAINER should match '<client>-odoo-prod', "