diff --git a/Dockerfile b/Dockerfile
index 9be2ecd..63a8215 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,8 +75,7 @@ COPY --from=builder /install /usr/local
 COPY misc/tor/torrc /etc/tor/torrc
 COPY misc/tor/start-tor.sh misc/tor/start-tor.sh
 COPY app/ app/
-COPY run .
-#COPY whoogle.env .
+COPY run whoogle.env* ./
 
 # Create user/group to run as
 RUN adduser -D -g $DOCKER_USERID -u $DOCKER_USERID $DOCKER_USER
diff --git a/app/__init__.py b/app/__init__.py
index 7fb05c1..a65be03 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -28,7 +28,7 @@ dot_env_path = (
     '../whoogle.env'))
 
 # Load .env file if enabled
-if read_config_bool('WHOOGLE_DOTENV'):
+if os.path.exists(dot_env_path):
     load_dotenv(dot_env_path)
 
 app.enc_key = generate_key()