diff --git a/course_discovery/apps/core/tests/test_prod_config.py b/course_discovery/apps/core/tests/test_prod_config.py
index a59ece630a..da0b34ec92 100644
--- a/course_discovery/apps/core/tests/test_prod_config.py
+++ b/course_discovery/apps/core/tests/test_prod_config.py
@@ -16,9 +16,11 @@ def test_production_media_storage(monkeypatch, tmp_path):
           AWS_QUERYSTRING_EXPIRE: false
           AWS_S3_CUSTOM_DOMAIN: cdn.org
           AWS_STORAGE_BUCKET_NAME: tests
-          DEFAULT_FILE_STORAGE: storages.backends.s3boto3.S3Boto3Storage
           MEDIA_ROOT: media
           MEDIA_URL: https://cdn.org/media/
+        STORAGES:
+          default:
+            BACKEND: storages.backends.s3boto3.S3Boto3Storage
     """)
     fake_config.write_text(fake_yaml_content)
 
diff --git a/course_discovery/settings/production.py b/course_discovery/settings/production.py
index 726008987a..d540b8af29 100644
--- a/course_discovery/settings/production.py
+++ b/course_discovery/settings/production.py
@@ -42,15 +42,6 @@
     vars().update(config_from_yaml)
 
     MEDIA_STORAGE_BACKEND = config_from_yaml.get("MEDIA_STORAGE_BACKEND", {})
-    default_backend = MEDIA_STORAGE_BACKEND.pop("DEFAULT_FILE_STORAGE", None)
-    static_backend = MEDIA_STORAGE_BACKEND.pop("STATICFILES_STORAGE", None)
-
-    if default_backend:
-        STORAGES["default"]["BACKEND"] = default_backend
-
-    if static_backend:
-        STORAGES["staticfiles"]["BACKEND"] = static_backend
-
     # Unpack media storage settings.
     # It's important we unpack here because of https://github.com/openedx/configuration/pull/3307
     vars().update(MEDIA_STORAGE_BACKEND)