diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/nginx.conf
similarity index 100%
rename from .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
rename to .examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/uploadsize.conf
similarity index 100%
rename from .examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/uploadsize.conf
rename to .examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
index 41106cab..c806203d 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
 POSTGRES_USER=nextcloud
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 39e85f71..18c51047 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -6,6 +6,9 @@ services:
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
+    environment:
+      # workaround for https://github.com/nextcloud/docker/issues/345
+      - POSTGRES_DB=deleteme
     env_file:
       - db.env
 
@@ -16,16 +19,18 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:
       - db
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html:ro
+      - ./configs/nginx.conf:/etc/nginx/nginx.conf
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -37,7 +42,7 @@ services:
       - default
 
   proxy:
-    build: ./proxy
+    image: jwilder/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
@@ -49,6 +54,7 @@ services:
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./configs/uploadsize.conf:/etc/nginx/conf.d/uploadsize.conf
     networks:
       - proxy-tier
 
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile
deleted file mode 100644
index 242c84e1..00000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM jwilder/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf