diff --git a/murano/common/cf_config.py b/murano/common/cf_config.py
index d00f3082..0d1f99b8 100644
--- a/murano/common/cf_config.py
+++ b/murano/common/cf_config.py
@@ -53,24 +53,22 @@ def parse_args(args=None, usage=None, default_config_files=None):
 
 def set_middleware_defaults():
     """Update default configuration options for oslo.middleware."""
-    # CORS Defaults
-    # TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/
-    cfg.set_defaults(cors.CORS_OPTS,
-                     allow_headers=['X-Auth-Token',
-                                    'X-Openstack-Request-Id',
-                                    'X-Configuration-Session',
-                                    'X-Roles',
-                                    'X-User-Id',
-                                    'X-Tenant-Id'],
-                     expose_headers=['X-Auth-Token',
-                                     'X-Openstack-Request-Id',
-                                     'X-Configuration-Session',
-                                     'X-Roles',
-                                     'X-User-Id',
-                                     'X-Tenant-Id'],
-                     allow_methods=['GET',
-                                    'PUT',
-                                    'POST',
-                                    'DELETE',
-                                    'PATCH']
-                     )
+    cors.set_defaults(
+        allow_headers=['X-Auth-Token',
+                       'X-Openstack-Request-Id',
+                       'X-Configuration-Session',
+                       'X-Roles',
+                       'X-User-Id',
+                       'X-Tenant-Id'],
+        expose_headers=['X-Auth-Token',
+                        'X-Openstack-Request-Id',
+                        'X-Configuration-Session',
+                        'X-Roles',
+                        'X-User-Id',
+                        'X-Tenant-Id'],
+        allow_methods=['GET',
+                       'PUT',
+                       'POST',
+                       'DELETE',
+                       'PATCH']
+    )
diff --git a/murano/common/config.py b/murano/common/config.py
index b61731e7..656b30d2 100644
--- a/murano/common/config.py
+++ b/murano/common/config.py
@@ -351,24 +351,23 @@ def parse_args(args=None, usage=None, default_config_files=None):
 
 def set_middleware_defaults():
     """Update default configuration options for oslo.middleware."""
-    # CORS Defaults
-    # TODO(krotscheck): Update with https://review.openstack.org/#/c/285368/
-    cfg.set_defaults(cors.CORS_OPTS,
-                     allow_headers=['X-Auth-Token',
-                                    'X-Openstack-Request-Id',
-                                    'X-Configuration-Session',
-                                    'X-Roles',
-                                    'X-User-Id',
-                                    'X-Tenant-Id'],
-                     expose_headers=['X-Auth-Token',
-                                     'X-Openstack-Request-Id',
-                                     'X-Configuration-Session',
-                                     'X-Roles',
-                                     'X-User-Id',
-                                     'X-Tenant-Id'],
-                     allow_methods=['GET',
-                                    'PUT',
-                                    'POST',
-                                    'DELETE',
-                                    'PATCH']
-                     )
+
+    cors.set_defaults(
+        allow_headers=['X-Auth-Token',
+                       'X-Openstack-Request-Id',
+                       'X-Configuration-Session',
+                       'X-Roles',
+                       'X-User-Id',
+                       'X-Tenant-Id'],
+        expose_headers=['X-Auth-Token',
+                        'X-Openstack-Request-Id',
+                        'X-Configuration-Session',
+                        'X-Roles',
+                        'X-User-Id',
+                        'X-Tenant-Id'],
+        allow_methods=['GET',
+                       'PUT',
+                       'POST',
+                       'DELETE',
+                       'PATCH']
+    )