diff --git a/Dockerfile b/Dockerfile
index 8325c84..284f944 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,9 +24,6 @@ WORKDIR /app
 COPY --from=strip-dev-deps /app ./
 COPY --from=frontend-compiler /app/frontend/public ./frontend/public
 RUN echo "JWT_SECRET=$(openssl rand -base64 256 | tr -d '\n')" > .env
-USER node
-USER root
-VOLUME /var/lib/waffle
 RUN mkdir -p /var/lib/waffle/uploads && chown -R node /var/lib/waffle/uploads
 USER node
 CMD [ "/bin/sh", "-c", "node index.js" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 4574eda..0e6891b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,6 @@ services:
       - POSTGRES_PASSWORD=supersecretpassword11
   waffle:
     build: .
-    volumes:
-      - ./tmp/waffle:/var/lib/waffle
     ports:
       - "5002:3000"
     environment:
@@ -21,5 +19,6 @@ services:
       - PGDATABASE=waffle
       - AVATAR_UPLOADS_DIR=/var/lib/waffle/uploads/avatar
       - ATTACHMENT_UPLOADS_DIR=/var/lib/waffle/uploads/attachment
+      - NODE_ENV=production
     depends_on:
       - waffle-postgres