diff --git a/dev.yml b/dev.yml
index f95b9b5f6..4a61a7a87 100644
--- a/dev.yml
+++ b/dev.yml
@@ -119,6 +119,7 @@ services:
       - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
       - ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
       - "${MEDIA_ROOT-./api/funkwhale_api/media}:/protected/media:ro"
+      - "./front:/frontend:ro"
     networks:
       - federation
       - internal
diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index 8b6eb4d8c..0ab9ec160 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -70,6 +70,9 @@ http {
             text/x-cross-domain-policy;
 
         location /front/ {
+            # uncomment the following line and comment the proxy-pass one
+            # to use the frontend build with "yarn build"
+            #alias /frontend/dist/;
             proxy_pass   http://funkwhale-front/front/;
         }
         location /front-server/ {