diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 4e9ae5dcdf..532d210ff5 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -9,7 +9,6 @@ This is the default template for our main set of AWS servers.
 import json
 import os
 import logging
-import logging.config
 
 from path import Path as path
 from xmodule.modulestore.modulestore_settings import convert_module_store_setting_if_needed
@@ -609,5 +608,4 @@ plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.CMS, plugin_c
 
 derive_settings(__name__)
 
-logging.config.dictConfig(LOGGING)
 logging.warn('DEPRECATION WARNING: aws.py has been deprecated, you should use production.py instead.')
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index e7d7437b3b..98c379a231 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -24,7 +24,7 @@ from openedx.core.release import RELEASE_LINE
 os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
 os.environ['CONFIG_ROOT'] = path(__file__).abspath().dirname()
 
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
 
 ######################### Testing overrides ####################################
 
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index ea36e73831..b770f9b683 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -4,7 +4,7 @@ Specific overrides to the base prod settings to make development easier.
 
 from os.path import abspath, dirname, join
 
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 # Don't use S3 in devstack, fall back to filesystem
 del DEFAULT_FILE_STORAGE
diff --git a/cms/envs/openstack.py b/cms/envs/openstack.py
index a69dd166c5..05f6069245 100644
--- a/cms/envs/openstack.py
+++ b/cms/envs/openstack.py
@@ -4,7 +4,7 @@ Settings for OpenStack deployments.
 
 # We import the aws settings because that's currently where the base settings are stored for all deployments.
 # TODO - fix this when aws.py is split/renamed.
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 SWIFT_AUTH_URL = AUTH_TOKENS.get('SWIFT_AUTH_URL')
 SWIFT_AUTH_VERSION = AUTH_TOKENS.get('SWIFT_AUTH_VERSION', 1)
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 45c98e8fd1..9279c0370d 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -21,7 +21,6 @@ import datetime
 import json
 import os
 import logging
-import logging.config
 import dateutil
 
 from path import Path as path
@@ -1108,5 +1107,4 @@ plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.LMS, plugin_c
 
 derive_settings(__name__)
 
-logging.config.dictConfig(LOGGING)
 logging.warn('DEPRECATION WARNING: aws.py has been deprecated, you should use production.py instead.')
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index f958b6a638..b5882fdffe 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -28,7 +28,7 @@ TEST_ROOT = CONFIG_ROOT.dirname().dirname() / "test_root"
 os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
 os.environ['CONFIG_ROOT'] = CONFIG_ROOT
 
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
 
 
 ######################### Testing overrides ####################################
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index c715f40d87..a496bac94d 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -3,7 +3,7 @@ Specific overrides to the base prod settings to make development easier.
 """
 from os.path import abspath, dirname, join
 
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 # Don't use S3 in devstack, fall back to filesystem
 del DEFAULT_FILE_STORAGE
diff --git a/lms/envs/load_test.py b/lms/envs/load_test.py
index 7b7e7df405..d0889ed8a6 100644
--- a/lms/envs/load_test.py
+++ b/lms/envs/load_test.py
@@ -6,7 +6,7 @@ Settings for load testing.
 # want to import all variables from base settings files
 # pylint: disable=wildcard-import, unused-wildcard-import
 
-from .aws import *
+from .production import *
 
 # Disable CSRF for load testing
 EXCLUDE_CSRF = lambda elem: elem not in [
diff --git a/lms/envs/openstack.py b/lms/envs/openstack.py
index bf420c5053..1fe8bb5254 100644
--- a/lms/envs/openstack.py
+++ b/lms/envs/openstack.py
@@ -4,7 +4,7 @@ Settings for OpenStack deployments.
 
 # We import the aws settings because that's currently where the base settings are stored for all deployments.
 # TODO - fix this when aws.py is split/renamed.
-from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 SWIFT_AUTH_URL = AUTH_TOKENS.get('SWIFT_AUTH_URL')
 SWIFT_AUTH_VERSION = AUTH_TOKENS.get('SWIFT_AUTH_VERSION', 1)