diff --git a/Dockerfile b/Dockerfile
index d3ad7e9912..94bea46e56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,8 @@ RUN apt-get update && \
         # lynx: Required by https://github.com/openedx/edx-platform/blob/b489a4ecb122/openedx/core/lib/html_to_text.py#L16
         lynx \
         ntp \
+        git \
+        build-essential \
         gettext \
         gfortran \
         graphviz \
@@ -83,10 +85,7 @@ FROM minimal-system as builder-production
 RUN apt-get update && \
     apt-get -y install --no-install-recommends \
         curl \
-        git \
-        git-core \
         pkg-config \
-        build-essential \
         libmysqlclient-dev \
         libssl-dev \
         libxml2-dev \
@@ -176,6 +175,5 @@ RUN touch ../edxapp_env
 
 ENV EDX_PLATFORM_SETTINGS='devstack_docker'
 ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
-ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS"
 EXPOSE ${SERVICE_PORT}
 CMD ./manage.py ${SERVICE_VARIANT} runserver 0.0.0.0:${SERVICE_PORT}