diff --git a/data/dbadmin/.placeholder b/data/pgadmin/.placeholder
similarity index 100%
rename from data/dbadmin/.placeholder
rename to data/pgadmin/.placeholder
diff --git a/dist.env b/dist.env
index 35e7139..bc68df0 100644
--- a/dist.env
+++ b/dist.env
@@ -1,6 +1,3 @@
-FLASK_ENV=production
-FLASK_APP=forest/__init__.py
-APP_FOLDER=/home/app/web
 SECRET_KEY=123
 RECAPTCHA_PUBLIC_KEY=456
 RECAPTCHA_PRIVATE_KEY=789
diff --git a/docker-compose.yml b/docker-compose.yml
index 41d3960..df6b642 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@ services:
       - internal
   pgadmin:
     image: dpage/pgadmin4
-    volumes:
-      - "./data/dbadmin/pgadmin:/var/lib/pgadmin"
+    #volumes:
+    #  - "./data/pgadmin/lib:/var/lib/pgadmin"
     env_file:
       - ./.env
     ports:
@@ -30,6 +30,10 @@ services:
     command: gunicorn --bind 0.0.0.0:5000 manage:app
     ports:
       - 5000:5000
+    environment:
+      - "FLASK_ENV=production"
+      - "FLASK_APP=forest/__init__.py"
+      - "APP_HOME=/app"
     env_file:
       - ./.env
     networks:
diff --git a/flask/Dockerfile b/flask/Dockerfile
index 74c9020..e6e887a 100644
--- a/flask/Dockerfile
+++ b/flask/Dockerfile
@@ -24,7 +24,8 @@ COPY . /usr/src/app/
 
 # install python dependencies
 COPY ./requirements.txt .
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
+RUN --mount=type=cache,target=/root/.cache \
+    pip install --wheel-dir /usr/src/app/wheels -r requirements.txt
 
 
 #########
@@ -41,8 +42,7 @@ RUN mkdir -p /home/app
 RUN addgroup --system app && adduser --system --group app
 
 # create the appropriate directories
-ENV HOME=/home/app
-ENV APP_HOME=/home/app/web
+ENV APP_HOME=/app
 RUN mkdir $APP_HOME
 WORKDIR $APP_HOME
 
diff --git a/flask/forest/config.py b/flask/forest/config.py
index d7a32cd..96f0915 100644
--- a/flask/forest/config.py
+++ b/flask/forest/config.py
@@ -10,8 +10,8 @@ class Config(object):
     RECAPTCHA_PRIVATE_KEY = f"{os.getenv('RECAPTCHA_PRIVATE_KEY')}"
     SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite://")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    STATIC_FOLDER = f"{os.getenv('APP_FOLDER')}/forest/static"
-    MEDIA_FOLDER = f"{os.getenv('APP_FOLDER')}/forest/media"
+    STATIC_FOLDER = f"{os.getenv('APP_HOME')}/forest/static"
+    MEDIA_FOLDER = f"{os.getenv('APP_HOME')}/forest/media"
     ADMIN_PREFIX = "fadmin"
     MAIL_SERVER = f"{os.getenv('MAIL_SERVER')}"
     MAIL_USERNAME = f"{os.getenv('MAIL_USERNAME')}"