diff --git a/Dockerfile b/Dockerfile
index a50f9a2b29500c75aaf2b3bec520ff2363655618..f9f447b8a66fb7515987c540aa064c5a6bdb4b32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,13 @@
-FROM python:2.7
+FROM python:3.6
 ENV PYTHONUNBUFFERED 1
-# HEALTHCHECK CMD curl --fail http://localhost:8000/ || exit 1
-RUN mkdir /go
-WORKDIR /go
-ADD requirements.txt /go/
 
 RUN apt-get update
-RUN apt-get install git-all -y
-RUN apt-get install python2.7-dev -y
 RUN apt-get install libsasl2-dev -y
 RUN apt-get install libldap2-dev -y
 RUN apt-get install netcat -y
 
-RUN apt-get install 
+RUN mkdir /go
+WORKDIR /go
+ADD requirements.txt /go/
 RUN pip install -r requirements.txt
 ADD . /go/
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ac09abe7c9786b4af4dd700de66b74d549034af..eb9532a3cc4c9b72cad7d7718ef49ee55732d68d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,12 +16,10 @@ services:
       - email_domain=@masonlive.gmu.edu
       - cas_url=https://cas.srct.gmu.edu/
       - superuser=dhaynes3
-      # - SECRET_KEY=much-secret
       - DB_NAME=go
       - DB_USER=go
       - DB_PASSWORD=go
       - DB_HOST=db
-      - PIWIK_SITE_ID=
       - PIWIK_URL=
       - EMAIL_HOST=
       - EMAIL_PORT=
diff --git a/startup.sh b/startup.sh
index 596486903d6358b1405826c83dd9a0952bf404e9..ad782d3c2d97e30ef8887148a455203b62b0382c 100755
--- a/startup.sh
+++ b/startup.sh
@@ -1,15 +1,15 @@
-# export SECRET_KEY=$(dd if=/dev/urandom count=100 | tr -dc "A-Za-z0-9" | fold -w 60 | head -n1 2>/dev/null)
-
 until nc -z db 3306; do
     echo "waiting for database to start..."
     sleep 1
 done
+
 cp go/settings/settings.docker.py.template go/settings/settings.py
 cp go/settings/secret.docker.py.template go/settings/secret.py
+
 export SECRET_KEY=$(dd if=/dev/urandom count=100 | tr -dc "A-Za-z0-9" | fold -w 60 | head -n1 2>/dev/null)
-python go/manage.py flush --no-input 
-python go/manage.py makemigrations 
-python go/manage.py makemigrations go 
+python go/manage.py flush --no-input
+python go/manage.py makemigrations
+python go/manage.py makemigrations go
 python go/manage.py migrate
 python go/manage.py createsuperuser --noinput --username=$superuser --email=$superuser$email_domain
-python go/manage.py runserver 0.0.0.0:8000
\ No newline at end of file
+python go/manage.py runserver 0.0.0.0:8000