diff --git a/conf/nginx.conf b/conf/nginx.conf
index 55d8d7e..c062f6a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,12 +7,6 @@ location __PATH__/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 
-	#enable subsonic api
-	if ( !-d $request_filename ) {
-		rewrite ^__PATH__/rest/(.*)\.view$ __PATH__/rest/index.php?action=$1 last;
-		rewrite ^__PATH__/rest/fake/(.+)$ __PATH__/play/$1 last;
-	}
-
 	rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&player=$7&name=$8 last;
 	rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/bitrate/([0-9]+)/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&bitrate=$7player=$8&name=$9 last;
 	rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/transcode_to/(w+)/bitrate/([0-9]+)/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&transcode_to=$7&bitrate=$8&player=$9&name=$10 last;
@@ -43,6 +37,13 @@ location __PATH__/ {
 	rewrite ^__PATH__/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&name=$7 last;
 
 	location __PATH__/rest {
+
+		#enable subsonic api
+		if ( !-d $request_filename ) {
+			rewrite ^__PATH__/rest/(.*)\.view$ __PATH__/rest/index.php?action=$1 last;
+			rewrite ^__PATH__/rest/fake/(.+)$ __PATH__/play/$1 last;
+		}
+
 		limit_except GET POST {
 			deny all;
 		}
diff --git a/pull_request_template.md b/pull_request_template.md
index a21f406..0dd5acc 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -19,7 +19,6 @@
 - [ ] **Approval (LGTM)** : 
 - [ ] **Approval (LGTM)** : 
 - **CI succeeded** : 
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/ampache_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/ampache_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.*  
-or  
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/ampache_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/ampache_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.*  
+[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/ampache_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/ampache_ynh%20PR-NUM-/)  
+*Please replace '-NUM-' in this link by the PR number.*  
 When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.