diff --git a/roles/music/files/funkwhale_proxy.conf b/roles/music/files/funkwhale_proxy.conf
index dccc782..312986f 100644
--- a/roles/music/files/funkwhale_proxy.conf
+++ b/roles/music/files/funkwhale_proxy.conf
@@ -1,16 +1,10 @@
-# use this one if you put the nginx container behind another proxy
-# you will have to set some headers on this proxy as well to ensure
-# everything works correctly, you can use the ones from the funkwhale_proxy.conf file
-# at https://dev.funkwhale.audio/funkwhale/funkwhale/blob/develop/deploy/funkwhale_proxy.conf
-# your proxy will also need to support websockets
-
+# global proxy conf
 proxy_set_header Host $host;
 proxy_set_header X-Real-IP $remote_addr;
-
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-proxy_set_header X-Forwarded-Host $http_x_forwarded_host;
-proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-Host $host:$server_port;
+proxy_set_header X-Forwarded-Port $server_port;
 proxy_redirect off;
 
 # websocket support
diff --git a/roles/music/templates/conf.env.j2 b/roles/music/templates/conf.env.j2
index ace770e..09fe825 100644
--- a/roles/music/templates/conf.env.j2
+++ b/roles/music/templates/conf.env.j2
@@ -35,6 +35,6 @@ PROXY_MEDIA=false
 AWS_DEFAULT_ACL=public-read
 
 THROTTLING_ENABLED=false
-EXTERNAL_REQUESTS_TIMEOUT=30
+EXTERNAL_REQUESTS_TIMEOUT=120
 
 NGINX_MAX_BODY_SIZE=500M
\ No newline at end of file
diff --git a/roles/music/vars/main.yml b/roles/music/vars/main.yml
index 0cb762d..a56cda6 100644
--- a/roles/music/vars/main.yml
+++ b/roles/music/vars/main.yml
@@ -1,4 +1,4 @@
-funkwhale_version: 1.3.0
+funkwhale_version: 1.4.0
 funkwhale_api_port: 5000
 funkwhale_nginx_port: 80
 funkwhale_static_root: /static