diff --git a/common.conf b/common.conf
index bb368bd..011814d 100644
--- a/common.conf
+++ b/common.conf
@@ -368,7 +368,7 @@ location /routing-data/v2/finland {
 
 location /routing-data/v3/hsl {
     rewrite /routing-data/v3/hsl/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-hsl-v3:8080/;
+    proxy_pass         http://opentripplanner-data-server-hsl-v3:8080/;
     proxy_redirect     off;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -378,7 +378,7 @@ location /routing-data/v3/hsl {
 
 location /routing-data/v3/waltti {
     rewrite /routing-data/v3/waltti/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-waltti-v3:8080/;
+    proxy_pass         http://opentripplanner-data-server-waltti-v3:8080/;
     proxy_redirect     off;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -388,17 +388,7 @@ location /routing-data/v3/waltti {
 
 location /routing-data/v3/varely {
     rewrite /routing-data/v3/varely/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-varely-v3: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/v3/kela {
-    rewrite /routing-data/v3/kela/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-kela-v3:8080/;
+    proxy_pass         http://opentripplanner-data-server-varely-v3:8080/;
     proxy_redirect     off;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -408,7 +398,7 @@ location /routing-data/v3/kela {
 
 location /routing-data/v3/waltti-alt {
     rewrite /routing-data/v3/waltti-alt/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-waltti-alt-v3:8080/;
+    proxy_pass         http://opentripplanner-data-server-waltti-alt-v3:8080/;
     proxy_redirect     off;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -418,7 +408,7 @@ location /routing-data/v3/waltti-alt {
 
 location /routing-data/v3/finland {
     rewrite /routing-data/v3/finland/(.*) /$1  break;
-    proxy_pass         http://opentripplanner-data-con-finland-v3:8080/;
+    proxy_pass         http://opentripplanner-data-server-finland-v3:8080/;
     proxy_redirect     off;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/test.js b/test.js
index 9b7ece8..b901e5a 100644
--- a/test.js
+++ b/test.js
@@ -174,13 +174,13 @@ describe('api.digitransit.fi', function() {
   testResponseHeader('api.digitransit.fi','/routing-data/v2/waltti/router-config.json', 'access-control-allow-origin', '*');
   testProxying('api.digitransit.fi','/routing-data/v2/finland/router-finland.zip','opentripplanner-data-con-finland:8080');
   testResponseHeader('api.digitransit.fi','/routing-data/v2/finland/router-config.json', 'access-control-allow-origin', '*');
-  testProxying('dev-api.digitransit.fi','/routing-data/v3/hsl/router-hsl.zip','opentripplanner-data-con-hsl-v3:8080');
+  testProxying('dev-api.digitransit.fi','/routing-data/v3/hsl/router-hsl.zip','opentripplanner-data-server-hsl-v3:8080');
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/hsl/router-config.json', 'access-control-allow-origin', '*');
-  testProxying('dev-api.digitransit.fi','/routing-data/v3/waltti/router-waltti.zip','opentripplanner-data-con-waltti-v3:8080');
+  testProxying('dev-api.digitransit.fi','/routing-data/v3/waltti/router-waltti.zip','opentripplanner-data-server-waltti-v3:8080');
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/waltti/router-config.json', 'access-control-allow-origin', '*');
-  testProxying('dev-api.digitransit.fi','/routing-data/v3/waltti-alt/router-waltti.zip','opentripplanner-data-con-waltti-alt-v3:8080');
+  testProxying('dev-api.digitransit.fi','/routing-data/v3/waltti-alt/router-waltti.zip','opentripplanner-data-server-waltti-alt-v3:8080');
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/waltti-alt/router-config.json', 'access-control-allow-origin', '*');
-  testProxying('dev-api.digitransit.fi','/routing-data/v3/finland/router-finland.zip','opentripplanner-data-con-finland-v3:8080');
+  testProxying('dev-api.digitransit.fi','/routing-data/v3/finland/router-finland.zip','opentripplanner-data-server-finland-v3:8080');
   testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/finland/router-config.json', 'access-control-allow-origin', '*');
   testProxying('api.digitransit.fi','/ui/v3/matka/sw.js','digitransit-ui-matka-v3:8080');
   testProxying('api.digitransit.fi','/ui/v3/hsl/sw.js','digitransit-ui-hsl-v3:8080');