diff --git a/Dockerfile b/Dockerfile
index 3d681f8..8241977 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.18-alpine
+FROM nginx:1.20-alpine
 MAINTAINER Reittiopas version: 0.1
 ENV INSTALL_DIR="/opt/nginx"
 
diff --git a/common.conf b/common.conf
index a7a002c..68d5334 100644
--- a/common.conf
+++ b/common.conf
@@ -146,20 +146,6 @@ location  /map/v1/next- {
     # add_header         X-Cache-Status $upstream_cache_status;
 }
 
-location  /map/v1/linjasto2021- {
-    rewrite /map/v1/linjasto2021-(.*) /map/v1/$1  break;
-    proxy_pass         http://hsl-map-server-linjasto2021:8080;
-    # proxy_cache        tiles;
-    # proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
-    # proxy_cache_revalidate on;
-    # proxy_cache_lock   on; 
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    # add_header         X-Cache-Status $upstream_cache_status;
-}
-
 location /map/v1/ {
     proxy_pass         http://hsl-map-server:8080;
     proxy_cache        tiles;
@@ -251,16 +237,6 @@ location /routing/v1/routers/next-waltti {
     proxy_read_timeout 11500ms;
 }
 
-location /routing/v1/routers/linjasto2021-waltti {
-    rewrite /routing/v1/routers/linjasto2021-waltti(.*) /otp/routers/default$1  break;
-    proxy_pass         http://opentripplanner-linjasto2021-waltti:8080/;
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    proxy_read_timeout 11500ms;
-}
-
 location /routing-data/v2/hsl {
     rewrite /routing-data/v2/hsl/(.*) /$1  break;
     proxy_pass         http://opentripplanner-data-con-hsl:8080/;
@@ -311,16 +287,6 @@ location /routing-data/v2/next-waltti {
     include            cors.conf;
 }
 
-location /routing-data/v2/linjasto2021-waltti {
-    rewrite /routing-data/v2/linjasto2021-waltti/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-linjasto2021-waltti:8080/;
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-    include            cors.conf;
-}
-
 location /routing-data/v2/next-finland {
     rewrite /routing-data/v2/next-finland/(.*) /$1  break;
     proxy_pass         http://opentripplanner-data-con-finland:8080/;
@@ -376,15 +342,6 @@ location /ui/v1/waltti-next/ {
     # proxy_set_header   X-Forwarded-Host $host;
 }
 
-location /ui/v1/linjasto2021/ {
-    rewrite /ui/v1/linjasto2021/(.*) /$1  break;
-    proxy_pass         http://digitransit-ui-linjasto2021:8080;
-    proxy_redirect     off;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    # proxy_set_header   X-Forwarded-Host $host;
-}
-
 location /timetables/v1/hsl/ {
     rewrite /timetables/v1/hsl/(.*) /hsl/$1  break;
     proxy_pass         http://hsl-timetable-container:8080;
@@ -404,3 +361,13 @@ location /fonts/ {
     add_header         'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
     add_header         'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
 }
+
+location /matka-fonts/ {
+    rewrite /matka-fonts/(.*) /$1  break;
+    proxy_pass         https://matkafonts.blob.core.windows.net;
+    proxy_redirect     off;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    # proxy_set_header   X-Forwarded-Host $host;
+    include            cors.conf;
+}
diff --git a/external.conf b/external.conf
index f0c557f..d04ce48 100644
--- a/external.conf
+++ b/external.conf
@@ -173,90 +173,6 @@ location /out/en-admin.sharingos.com/ {
   proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
 }
 
-#Matkahuolto kainuu gtfs (https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/kainuu-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_KAINUU_BASIC_AUTH;
-}
-
-#Matkahuolto savo gtfs (https://minfoapi.matkahuolto.fi/gtfs/savo-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/savo-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/savo-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_SAVO_BASIC_AUTH;
-}
-
-#Matkahuolto kanta gtfs (https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/kanta-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_KANTA_BASIC_AUTH;
-}
-
-#Matkahuolto karjala gtfs (https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/karjala-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_KARJALA_BASIC_AUTH;
-}
-
-#Matkahuolto keski gtfs (https://minfoapi.matkahuolto.fi/gtfs/keski-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/keski-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/keski-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_KESKI_BASIC_AUTH;
-}
-
-#Matkahuolto kyme gtfs (https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/kyme-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_KYME_BASIC_AUTH;
-}
-
-#Matkahuolto lappi gtfs (https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/lappi-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_LAPPI_BASIC_AUTH;
-}
-
-#Matkahuolto pohjanmaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_POHJANMAA_BASIC_AUTH;
-}
-
-#Matkahuolto satakunta gtfs (https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/satakunta-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_SATAKUNTA_BASIC_AUTH;
-}
-
-#Matkahuolto vakka gtfs (https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/vakka-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_VAKKA_BASIC_AUTH;
-}
-
-#Matkahuolto vantaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/vantaa-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_VANTAA_BASIC_AUTH;
-}
-
-#Matkahuolto varsinais gtfs (https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/gtfs.zip )
-location /out/minfoapi.matkahuolto.fi/gtfs/varsinais-fi/ {
-  proxy_pass    https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/;
-  include allowed-ips.conf;
-  proxy_set_header Authorization MATKAHUOLTO_VARSINAIS_BASIC_AUTH;
-}
-
 #Oulu bike stations (https://poland.nextbike.net/maps/nextbike-official.json?domains=fo)
 location /out/poland.nextbike.net/ {
   proxy_pass    https://poland.nextbike.net/;
@@ -331,3 +247,36 @@ location /out/lifti.mattersoft.fi/ {
   proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
   proxy_set_header Authorization VAASA_BASIC_AUTH;
 }
+
+#salo gtfs rt  (https://paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition)
+location /out/paikku.mattersoft.fi/ {
+  proxy_pass    https://paikku.mattersoft.fi/;
+  include allowed-ips.conf;
+  proxy_cache   ext_cache;
+  proxy_cache_valid 200 30s;
+  proxy_cache_lock on;
+  add_header X-Proxy-Cache $upstream_cache_status;
+  proxy_ignore_headers X-Accel-Expires Expires Cache-Control Set-Cookie;
+  proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
+  proxy_set_header Authorization SALO_BASIC_AUTH;
+}
+
+#kouvola gtfs rt  (https://koutsi.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition)
+location /out/koutsi.mattersoft.fi/ {
+  proxy_pass    https://koutsi.mattersoft.fi/;
+  include allowed-ips.conf;
+  proxy_cache   ext_cache;
+  proxy_cache_valid 200 30s;
+  proxy_cache_lock on;
+  add_header X-Proxy-Cache $upstream_cache_status;
+  proxy_ignore_headers X-Accel-Expires Expires Cache-Control Set-Cookie;
+  proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
+  proxy_set_header Authorization KOUVOLA_BASIC_AUTH;
+}
+
+#perille gtfs
+location /out/gtfs.perille.fi/ {
+  proxy_pass    https://gtfs.perille.fi/;
+  include allowed-ips.conf;
+  proxy_set_header Authorization PERILLE_BASIC_AUTH;
+}
diff --git a/nginx.conf b/nginx.conf
index 07ef639..9a6e350 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -46,6 +46,9 @@ http {
   # hide server version from response
   server_tokens off;
 
+  # to get rid of a warning about server_names_hash building
+  server_names_hash_bucket_size  128;
+
   # API endpoints
   # These domains handle only api calls, not UI
   # a-,b-,c- prefixes are ment to be used with map raster image multidomain support
@@ -149,6 +152,12 @@ http {
     # Add HTTP Strict Transport Security for good measure.
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
 
+    error_page 500 502 503 504 /502.html;
+    location = /502.html {
+      proxy_pass https://errorpages.blob.core.windows.net/html/digitransit-error-page.html;
+      internal;
+    }
+
     location = /sw.js {
       proxy_pass         http://digitransit-ui-default:8080;
       proxy_redirect     off;
@@ -177,19 +186,11 @@ http {
     server_name beta.matka.fi;
     listen 8080;
 
-    return 301 https://www.liikennevirasto.fi/uutinen/-/asset_publisher/SHHdKcU2jahL/content/matka-fi-osoite-muuttuu;
+    return 301 https://dev.digitransit.fi;
   }
 
   server {
-    server_name dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
-                dev-joensuu.digitransit.fi joensuu.digitransit.fi
-                dev-kotka.digitransit.fi kotka.digitransit.fi
-                dev-lahti.digitransit.fi lahti.digitransit.fi
-                dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi
-                dev-oulu.digitransit.fi oulu.digitransit.fi
-                dev-kouvola.digitransit.fi kouvola.digitransit.fi
-                dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi
-                dev-opas.waltti.fi opas.waltti.fi;
+    server_name dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi;
     listen 8080;
 
     if ($http_x_forwarded_proto != "https") {
@@ -227,52 +228,27 @@ http {
     server_name dev-linjasto2021.digitransit.fi linjasto2021.digitransit.fi;
     listen 8080;
 
-    if ($http_x_forwarded_proto != "https") {
-      return 301 https://$host$request_uri;
-    }
-
-    # Add HTTP Strict Transport Security for good measure.
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
-
-    location = /sw.js {
-      proxy_pass         http://digitransit-ui-linjasto2021:8080;
-      proxy_redirect     off;
-      proxy_set_header   X-Real-IP $remote_addr;
-      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header   X-Forwarded-Host $host;
-      proxy_cache sw;
-      proxy_cache_valid 200 30s;
-      proxy_cache_lock on;
-      proxy_cache_key "$host$request_uri";
-      add_header X-Proxy-Cache $upstream_cache_status;
-      proxy_ignore_headers X-Accel-Expires Expires Cache-Control Set-Cookie;
-      proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
-    }
-
     location / {
-      proxy_pass         http://digitransit-ui-linjasto2021:8080;
-      proxy_redirect     off;
-      proxy_set_header   X-Real-IP $remote_addr;
-      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header   X-Forwarded-Host $host;
+      return 301 https://reittiopas.tampere.fi;
     }
   }
 
   server {
-    server_name next-dev-hameenlinna.digitransit.fi
-                next-dev-joensuu.digitransit.fi
+    server_name next-dev-hameenlinna.digitransit.fi dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
+                next-dev-joensuu.digitransit.fi dev-joensuu.digitransit.fi joensuu.digitransit.fi
                 next-dev-jyvaskyla.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi
-                next-dev-kotka.digitransit.fi
+                next-dev-kotka.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi
                 next-dev-kuopio.digitransit.fi dev-kuopio.digitransit.fi kuopio.digitransit.fi
-                next-dev-lahti.digitransit.fi
-                next-dev-lappeenranta.digitransit.fi
+                next-dev-lahti.digitransit.fi dev-lahti.digitransit.fi lahti.digitransit.fi
+                next-dev-lappeenranta.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi
                 next-dev-mikkeli.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi
-                next-dev-oulu.digitransit.fi
+                next-dev-oulu.digitransit.fi dev-oulu.digitransit.fi oulu.digitransit.fi
                 next-dev-turku.digitransit.fi dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi
                 next-dev-tampere.digitransit.fi dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi
-                next-dev-kouvola.digitransit.fi
+                next-dev-kouvola.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi
                 next-dev-rovaniemi.digitransit.fi
-                next-dev-opas.waltti.fi;
+                next-dev-opas.waltti.fi dev-opas.waltti.fi opas.waltti.fi
+                next-dev-vaasa.digitransit.fi dev-vaasa.digitransit.fi vaasa.digitransit.fi;
     listen 8080;
 
     if ($http_x_forwarded_proto != "https") {
@@ -282,6 +258,12 @@ http {
     # Add HTTP Strict Transport Security for good measure.
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
 
+    error_page 500 502 503 504 /502.html;
+    location = /502.html {
+      proxy_pass https://errorpages.blob.core.windows.net/html/digitransit-error-page.html;
+      internal;
+    }
+
     location = /sw.js {
       proxy_pass         http://digitransit-ui-waltti-next:8080;
       proxy_redirect     off;
@@ -391,12 +373,6 @@ http {
     # Add HTTP Strict Transport Security for good measure.
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
 
-    error_page 500 502 503 504 /502.html;
-    location = /502.html {
-      proxy_pass https://errorpages.blob.core.windows.net/html/error_page.html;
-      internal;
-    }
-
     location / {
       proxy_pass         http://digitransit-site:8080;
       proxy_redirect     off;
diff --git a/run.sh b/run.sh
index 409d454..8664b19 100755
--- a/run.sh
+++ b/run.sh
@@ -12,23 +12,14 @@ sed -i "s/LINKKI_BASIC_AUTH/${LINKKI_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/NEW_LISSU_BASIC_AUTH/${NEW_LISSU_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/transitdatadev/${HSL_RT_STORAGE_NAME}/" /etc/nginx/common.conf
 sed -i "s/LAHTI_BASIC_AUTH/${LAHTI_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_KAINUU_BASIC_AUTH/${MATKAHUOLTO_KAINUU_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_SAVO_BASIC_AUTH/${MATKAHUOLTO_SAVO_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_KANTA_BASIC_AUTH/${MATKAHUOLTO_KANTA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_KARJALA_BASIC_AUTH/${MATKAHUOLTO_KARJALA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_KESKI_BASIC_AUTH/${MATKAHUOLTO_KESKI_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_KYME_BASIC_AUTH/${MATKAHUOLTO_KYME_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_LAPPI_BASIC_AUTH/${MATKAHUOLTO_LAPPI_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_POHJANMAA_BASIC_AUTH/${MATKAHUOLTO_POHJANMAA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_SATAKUNTA_BASIC_AUTH/${MATKAHUOLTO_SATAKUNTA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_VAKKA_BASIC_AUTH/${MATKAHUOLTO_VAKKA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_VANTAA_BASIC_AUTH/${MATKAHUOLTO_VANTAA_BASIC_AUTH}/" /etc/nginx/external.conf
-sed -i "s/MATKAHUOLTO_VARSINAIS_BASIC_AUTH/${MATKAHUOLTO_VARSINAIS_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/HAMEENLINNA_BASIC_AUTH/${HAMEENLINNA_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/dev.hslfi.hsldev.com/${NEW_HSL_FI_URL}/" /etc/nginx/nginx.conf
 sed -i "s/LMJ_BASIC_AUTH/${LMJ_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/MIKKELI_BASIC_AUTH/${MIKKELI_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/VAASA_BASIC_AUTH/${VAASA_BASIC_AUTH}/" /etc/nginx/external.conf
+sed -i "s/SALO_BASIC_AUTH/${SALO_BASIC_AUTH}/" /etc/nginx/external.conf
+sed -i "s/KOUVOLA_BASIC_AUTH/${KOUVOLA_BASIC_AUTH}/" /etc/nginx/external.conf
+sed -i "s/PERILLE_BASIC_AUTH/${PERILLE_BASIC_AUTH}/" /etc/nginx/external.conf
 
 #start nginx
 nginx
diff --git a/test.js b/test.js
index 81081c4..ff30689 100644
--- a/test.js
+++ b/test.js
@@ -201,10 +201,12 @@ describe('matka ui', function() {
 });
 
 describe('waltti ui', function() {
-  const legacyUICities = ['hameenlinna', 'joensuu', 'kotka', 'lahti',
-                  'lappeenranta', 'oulu', 'kouvola', 'rovaniemi'];
+  const legacyUICities = ['rovaniemi'];
 
-  const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere'];
+  const newUICities = [
+    'jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa', 'hameenlinna',
+    'joensuu', 'kotka', 'lahti', 'lappeenranta', 'kouvola','oulu'
+  ];
 
   legacyUICities.forEach(function(city) {
     testRedirect('dev-'+city+'.digitransit.fi','/kissa','https://dev-'+city+'.digitransit.fi/kissa');
@@ -228,7 +230,7 @@ describe('waltti ui', function() {
   testProxying('reittiopas.foli.fi','/','digitransit-ui-waltti-next:8080', true);
 
   testRedirect('reittiopas.hameenlinna.fi','/kissa','https://reittiopas.hameenlinna.fi/kissa');
-  testProxying('reittiopas.hameenlinna.fi','/','digitransit-ui-waltti:8080', true);
+  testProxying('reittiopas.hameenlinna.fi','/','digitransit-ui-waltti-next:8080', true);
 
   testRedirect('repa.tampere.fi','/kissa','https://repa.tampere.fi/kissa');
   testProxying('repa.tampere.fi','/','digitransit-ui-waltti-next:8080', true);
@@ -238,7 +240,7 @@ describe('waltti ui', function() {
   testCaching('reittiopas.tampere.fi','/sw.js', true);
 
   testRedirect('opas.waltti.fi','/kissa','https://opas.waltti.fi/kissa');
-  testProxying('opas.waltti.fi','/','digitransit-ui-waltti:8080', true);
+  testProxying('opas.waltti.fi','/','digitransit-ui-waltti-next:8080', true);
 
   testRedirect('next-dev-opas.waltti.fi','/kissa','https://next-dev-opas.waltti.fi/kissa');
   testProxying('next-dev-opas.waltti.fi','/','digitransit-ui-waltti-next:8080', true);
@@ -252,8 +254,7 @@ describe('waltti ui', function() {
 });
 
 describe('linjasto2021 ui', function() {
-  testRedirect('linjasto2021.digitransit.fi','/kissa','https://linjasto2021.digitransit.fi/kissa');
-  testProxying('linjasto2021.digitransit.fi','/','digitransit-ui-linjasto2021:8080', true);
+  testRedirect('linjasto2021.digitransit.fi','/kissa','https://reittiopas.tampere.fi');
 });
 
 describe('sentry-analytics', function() {
diff --git a/test.sh b/test.sh
index 46755ee..1a635b8 100755
--- a/test.sh
+++ b/test.sh
@@ -17,15 +17,10 @@ echo $ADDHOSTS
 CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test\"" \
   -e JOJO_BASIC_AUTH="\"test\"" -e LAPPEENRANTA_BASIC_AUTH="\"test\"" -e LINKKI_BASIC_AUTH="\"test\"" \
   -e NEW_LISSU_BASIC_AUTH="\"test\"" -e LAHTI_BASIC_AUTH="\"test\"" -e HSL_RT_STORAGE_NAME=transitdataprod \
-  -e MATKAHUOLTO_KAINUU_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_SAVO_BASIC_AUTH="\"test\"" \
-  -e MATKAHUOLTO_KANTA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_KARJALA_BASIC_AUTH="\"test\"" \
-  -e MATKAHUOLTO_KESKI_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_KYME_BASIC_AUTH="\"test\"" \
-  -e MATKAHUOLTO_LAPPI_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_POHJANMAA_BASIC_AUTH="\"test\"" \
-  -e MATKAHUOLTO_SATAKUNTA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VAKKA_BASIC_AUTH="\"test\"" \
-  -e MATKAHUOLTO_VANTAA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VARSINAIS_BASIC_AUTH="\"test\"" \
   -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \
   -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \
-  -e VAASA_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest`
+  -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \
+  -e KOUVOLA_BASIC_AUTH="\"test\"" -e PERILLE_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest`
 
 curl -v http://127.0.0.1:9000
 
@@ -35,7 +30,7 @@ echo starting echo server...
 node test_server.js &
 PID=$!
 
-sleep 5
+sleep 10
 
 mocha
 STATUS=$?