diff --git a/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf b/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
index c888525b66396f62832723cf042899e51fa7b103..ab1fb216284bda85c1eab4c449c5f1fdd9e36908 100644
--- a/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
+++ b/2.Common_services/5.Nginx/vhost_mediaserver-msuser.conf
@@ -16,7 +16,7 @@ server {
 		root /tmp/letsencrypt;
 	}
 	location / {
-		rewrite ^ https://$host$request_uri? permanent;
+		return 301 https://$host$request_uri;
 	}
 }
 
diff --git a/2.Common_services/5.Nginx/vhost_msmonitor.conf b/2.Common_services/5.Nginx/vhost_msmonitor.conf
index a5f2ff72952b69db7d879fa67280126b5fcb4358..39e58ce6e2a666e3b0d1f02223617bae81b2217e 100644
--- a/2.Common_services/5.Nginx/vhost_msmonitor.conf
+++ b/2.Common_services/5.Nginx/vhost_msmonitor.conf
@@ -7,7 +7,7 @@ server {
 		root /tmp/letsencrypt;
 	}
 	location / {
-		rewrite ^ https://$host$request_uri? permanent;
+		return 301 https://$host$request_uri;
 	}
 }
 
diff --git a/2.Common_services/5.Nginx/vhost_skyreach.conf b/2.Common_services/5.Nginx/vhost_skyreach.conf
index b8daaa02e574340c6bd2aba1148c208a2a826bec..7945e3aaaca632ad10a967c66b0621d6d5e22443 100644
--- a/2.Common_services/5.Nginx/vhost_skyreach.conf
+++ b/2.Common_services/5.Nginx/vhost_skyreach.conf
@@ -7,7 +7,7 @@ server {
 		root /tmp/letsencrypt;
 	}
 	location / {
-		rewrite ^ https://$host$request_uri? permanent;
+		return 301 https://$host$request_uri;
 	}
 }
 
@@ -67,13 +67,7 @@ server {
 	}
 
 	# APT proxy urls
-	location /fr.archive.ubuntu.com/ubuntu {
-		proxy_pass http://127.0.0.1:3142;
-	}
-	location /security.ubuntu.com/ubuntu {
-		proxy_pass http://127.0.0.1:3142;
-	}
-	location /old-releases.ubuntu.com/ubuntu {
+	location ~ /[\w\d\.-_]+.ubuntu.com/ubuntu {
 		proxy_pass http://127.0.0.1:3142;
 	}
 }