diff --git a/changes/changelog.d/2002.bugfix b/changes/changelog.d/2002.bugfix
new file mode 100644
index 000000000..30a783f92
--- /dev/null
+++ b/changes/changelog.d/2002.bugfix
@@ -0,0 +1 @@
+ Remove trailing slash from reverse proxy configuration
diff --git a/deploy/docker.proxy.template b/deploy/docker.proxy.template
index ee7444724..a4b297f20 100644
--- a/deploy/docker.proxy.template
+++ b/deploy/docker.proxy.template
@@ -65,6 +65,6 @@ server {
     location / {
         include /etc/nginx/funkwhale_proxy.conf;
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
-        proxy_pass   http://fw/;
+        proxy_pass   http://fw;
     }
 }
diff --git a/deploy/nginx.template b/deploy/nginx.template
index 4439bd3cd..2498a0318 100644
--- a/deploy/nginx.template
+++ b/deploy/nginx.template
@@ -87,7 +87,7 @@ server {
         include /etc/nginx/funkwhale_proxy.conf;
         # This is needed if you have file import via upload enabled.
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
-        proxy_pass   http://funkwhale-api/;
+        proxy_pass   http://funkwhale-api;
     }
 
     location / {
@@ -106,7 +106,7 @@ server {
 
     location /federation/ {
         include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/federation/;
+        proxy_pass   http://funkwhale-api;
     }
 
     # You can comment this if you do not plan to use the Subsonic API.
@@ -117,7 +117,7 @@ server {
 
     location /.well-known/ {
         include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/.well-known/;
+        proxy_pass   http://funkwhale-api;
     }
 
     location /media/ {
diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index 9fcf2dce5..0a931289b 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -80,11 +80,11 @@ http {
             include /etc/nginx/funkwhale_proxy.conf;
             # This is needed if you have file import via upload enabled.
             client_max_body_size ${NGINX_MAX_BODY_SIZE};
-            proxy_pass   http://funkwhale-api/api/;
+            proxy_pass   http://funkwhale-api;
         }
 
         location / {
-            proxy_pass   http://funkwhale-front/;
+            proxy_pass   http://funkwhale-front;
             expires 1d;
         }
 
@@ -92,13 +92,13 @@ http {
             add_header Content-Security-Policy "connect-src https: http: 'self'; default-src 'self'; script-src 'self' unpkg.com 'unsafe-inline' 'unsafe-eval'; style-src https: http: 'self' 'unsafe-inline'; img-src https: http: 'self' data:; font-src https: http: 'self' data:; object-src 'none'; media-src https: http: 'self' data:";
             add_header Referrer-Policy "strict-origin-when-cross-origin";
 
-            proxy_pass   http://funkwhale-front/embed.html;
+            proxy_pass   http://funkwhale-front;
             expires 1d;
         }
 
         location /federation/ {
             include /etc/nginx/funkwhale_proxy.conf;
-            proxy_pass   http://funkwhale-api/federation/;
+            proxy_pass   http://funkwhale-api;
         }
 
         # You can comment this if you do not plan to use the Subsonic API.
@@ -109,7 +109,7 @@ http {
 
         location /.well-known/ {
             include /etc/nginx/funkwhale_proxy.conf;
-            proxy_pass   http://funkwhale-api/.well-known/;
+            proxy_pass   http://funkwhale-api;
         }
 
         location /media/ {
diff --git a/front/docker/funkwhale.conf.template b/front/docker/funkwhale.conf.template
index 734c72e34..de876ce2c 100644
--- a/front/docker/funkwhale.conf.template
+++ b/front/docker/funkwhale.conf.template
@@ -52,7 +52,7 @@ server {
         include /etc/nginx/funkwhale_proxy.conf;
         # This is needed if you have file import via upload enabled.
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
-        proxy_pass   http://funkwhale-api/;
+        proxy_pass   http://funkwhale-api;
     }
 
     location / {
@@ -71,7 +71,7 @@ server {
 
     location /federation/ {
         include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/federation/;
+        proxy_pass   http://funkwhale-api;
     }
 
     # You can comment this if you do not plan to use the Subsonic API.
@@ -82,7 +82,7 @@ server {
 
     location /.well-known/ {
         include /etc/nginx/funkwhale_proxy.conf;
-        proxy_pass   http://funkwhale-api/.well-known/;
+        proxy_pass   http://funkwhale-api;
     }
 
     location /media/ {