diff --git a/abra.sh b/abra.sh
index a997bc0..448cce9 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2145
 
 export NGINX_CONFIG_VERSION=v2
-export APP_ENTRYPOINT_VERSION=v1
+export APP_ENTRYPOINT_VERSION=v2
 
 sub_npm() {
   abra__service_="app"
diff --git a/compose.yml b/compose.yml
index 542843a..c282f36 100644
--- a/compose.yml
+++ b/compose.yml
@@ -51,7 +51,7 @@ services:
     volumes:
       - app-data:/data
       - app-config:/config
-      - app-assets:/app/client/dist
+      - app-assets:/srv/client/dist
     secrets:
       - db_password
     configs:
diff --git a/entrypoint.sh b/entrypoint.sh
index 06eccd6..7175127 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,6 +30,10 @@ if [ -z "$PEERTUBE_SMTP_ENABLED" ]; then
    file_env "PEERTUBE_SMTP_PASSWORD"
 fi
 
+# Copy the client files over to a named volume
+# so that they may be served by nginx directly
+cp -ar /app/client/dist /srv/client
+
 # upstream entrypoint
 # https://github.com/Chocobozzz/PeerTube/blob/66f77f63437c6774acbd72584a9839a7636ea167/support/docker/production/entrypoint.sh
 /usr/local/bin/entrypoint.sh "$@"