diff --git a/Dockerfile b/Dockerfile
index 62a1e4fcbb..d7752ff100 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,10 @@ RUN chown -R docker /var/www/html
 RUN \
 	rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
       && rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
-      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups"
+      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
+      && mkdir "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
+      && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
+      && chown docker "/var/lib/snipeit/keys/"
 
 ############## DEPENDENCIES via COMPOSER ###################
 
diff --git a/docker.env b/docker.env
deleted file mode 100644
index 88ed191ce1..0000000000
--- a/docker.env
+++ /dev/null
@@ -1,28 +0,0 @@
-# Docker Environment File
-
-#Database Variables
-MYSQL_ROOT_PASSWORD=supersecuresecretthing
-MYSQL_DATABASE=snipeit
-MYSQL_USER=snipeit
-MYSQL_PASSWORD=tinglewingler
-
-#Email Variables
-MAIL_PORT_587_TCP_ADDR=smtp.mandrillapp.com
-MAIL_PORT_587_TCP_PORT=587
-MAIL_ENV_FROM_ADDR=you@example.com
-MAIL_ENV_FROM_NAME=Snipe-IT
-MAIL_ENV_ENCRYPTION=tcp
-MAIL_ENV_USERNAME=you@example.com
-MAIL_ENV_PASSWORD=N7AqLufTZMULWHWYwJ0ZCw
-MAIL_ENV_REPLYTO_ADDR=you@example.com
-MAIL_ENV_REPLYTO_NAME='Snipe-IT'
-
-#SNIPE-IT Variables
-APP_ENV=develop
-APP_DEBUG=true
-APP_KEY=Y5hJeC7x1i7OxhDrvrQPlB9KvCorvRdO
-APP_URL=http://127.0.0.1:32782
-APP_TIMEZONE=US/Pacific
-APP_LOCALE=en
-
-ALLOW_IFRAMING=false