diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index 334fed0b91..8ca28c9ee6
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,6 +65,8 @@ services:
   janeway-web:
     build:
       context: .
+      args:
+        JANEWAY_SETTINGS_FILE: ${JANEWAY_SETTINGS_FILE}
       dockerfile: dockerfiles/Dockerfile
     volumes:
       - ./src:/vol/janeway/src
@@ -81,7 +83,8 @@ services:
       - DB_USER
       - DB_NAME
       - PYTHONDONTWRITEBYTECODE=yes
-      - JANEWAY_SETTINGS_MODULE=core.dev_settings
+      - JANEWAY_SETTINGS_MODULE
+      - JANEWAY_SETTINGS_FILE
       - NOSE_INCLUDE_EXE=1
       - JANEWAY_EMAIL_BACKEND
       - JANEWAY_EMAIL_HOST
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index 6595db63aa..ef80fdeede 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -1,6 +1,10 @@
 FROM birkbeckctp/janeway-base:latest
+ARG JANEWAY_SETTINGS_FILE
+ENV JANEWAY_SETTINGS_FILE=$JANEWAY_SETTINGS_FILE
+
 ADD . /vol/janeway
 WORKDIR /vol/janeway
+
 RUN apt-get update
 RUN apt-get install -y pylint
 RUN apt-get install -y gettext
@@ -9,7 +13,9 @@ RUN pip3 install -r dev-requirements.txt --src /tmp/src
 RUN find "/vol/janeway/src/plugins/" -print -iname "*requirements.txt" -exec pip3 install -r {} --src /tmp/src \;
 RUN pip3 install mysqlclient
 RUN if [ -n "$(ls -A ./lib)" ]; then pip3 install -e lib/*; fi
-RUN cp src/core/janeway_global_settings.py src/core/settings.py
+
+RUN mkdir -p /usr/code/janeway/src/core
+RUN if [ -f "${JANEWAY_SETTINGS_FILE}" ]; then cp ${JANEWAY_SETTINGS_FILE} /usr/code/janeway/src/core/settings.py; else cp src/core/dev_settings.py /usr/code/janeway/src/core/settings.py; fi
 
 EXPOSE 8000
 STOPSIGNAL SIGINT
diff --git a/etc/defaults.env b/etc/defaults.env
index 759b93aff7..039477df1b 100644
--- a/etc/defaults.env
+++ b/etc/defaults.env
@@ -20,3 +20,10 @@ DB_PASSWORD=
 DB_HOST=db.janeway.internal
 DB_PORT=5432
 
+###############################################################################
+# Settings Module
+
+# Make sure these point to the same file.
+JANEWAY_SETTINGS_MODULE=core.dev_settings
+JANEWAY_SETTINGS_FILE=src/core/dev_settings.py
+
diff --git a/etc/local.env.example b/etc/local.env.example
index f006237b45..3ca8d28789 100644
--- a/etc/local.env.example
+++ b/etc/local.env.example
@@ -20,3 +20,9 @@ DB_PASSWORD=
 DB_HOST=db.janeway.internal
 DB_PORT=5432
 
+###############################################################################
+# Settings Module
+
+# Make sure these point to the same file.
+JANEWAY_SETTINGS_MODULE=core.settings
+JANEWAY_SETTINGS_FILE=src/core/settings.py