diff --git a/sourcearcade.yml b/sourcearcade.yml
index ffb1279..6d91d78 100644
--- a/sourcearcade.yml
+++ b/sourcearcade.yml
@@ -4,6 +4,7 @@
     build:
       context: .
       dockerfile: nginx/Dockerfile
+    env_file: environment
     ports:
       - "80:80"
       - "443:443"
@@ -11,24 +12,23 @@
       - simpleidnet
       - gerritnet
     volumes:
-      - ./simpleid/cache/:/var/cache/simpleid/:ro
-      - ./simpleid/identities/:/var/db/simpleid/:ro
-      - ./simpleid/store/:/var/lib/simpleid/:ro
-      - ./simpleid/www/:/var/www/html/:ro
-      - ./nginx/sa.conf:/etc/nginx/conf.d/sa.conf:ro
+      - ./simpleid/identities/:/var/db/simpleid-templates/:ro
+      - ./simpleid/www/:/var/www/simpleid/:ro
+      - ./nginx/sa.conf:/etc/nginx/conf.d/sa.conf.template:ro
       - ./nginx/empty.conf:/etc/nginx/conf.d/default.conf:ro
       - ./logs/nginx:/var/log/nginx/:rw
   simpleid:
     build:
       context: .
       dockerfile: simpleid/Dockerfile
+    env_file: environment
     networks:
       - simpleidnet
     volumes:
       - ./simpleid/cache/:/var/cache/simpleid/:rw
-      - ./simpleid/identities/:/var/db/simpleid/:ro
+      - ./simpleid/identities/:/var/db/simpleid-templates/:ro
       - ./simpleid/store/:/var/lib/simpleid/:rw
-      - ./simpleid/www/:/var/www/html/:ro
+      - ./simpleid/www/:/var/www/simpleid/:ro
       - ./logs/simpleid/:/var/log/:rw
   gerrit:
     build: