diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java
index 4aafd668..af5114fb 100644
--- a/enabler/src/de/schildbach/pte/VgsProvider.java
+++ b/enabler/src/de/schildbach/pte/VgsProvider.java
@@ -26,18 +26,17 @@ import okhttp3.HttpUrl;
 /**
  * @author Andreas Schildbach
  */
-public class VgsProvider extends AbstractHafasLegacyProvider {
-    private static final HttpUrl API_BASE = HttpUrl.parse("https://www.saarfahrplan.de/cgi-bin/");
-    // http://www.vgs-online.de/cgi-bin/
+public class VgsProvider extends AbstractHafasClientInterfaceProvider {
+    private static final HttpUrl API_BASE = HttpUrl.parse("https://saarfahrplan.de/bin/");
     private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN,
             Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM,
             Product.BUS, Product.CABLECAR, Product.ON_DEMAND, Product.BUS };
 
-    public VgsProvider() {
-        super(NetworkId.VGS, API_BASE, "dn", PRODUCTS_MAP);
-        setStationBoardHasStationTable(false);
-        httpClient.setTrustAllCertificates(true);
-        httpClient.setSslAcceptAllHostnames(true);
+    public VgsProvider(final String jsonApiAuthorization) {
+        super(NetworkId.VGS, API_BASE, PRODUCTS_MAP);
+        setApiVersion("1.21");
+        setApiClient("{\"id\":\"ZPS-SAAR\",\"type\":\"AND\"}");
+        setApiAuthorization(jsonApiAuthorization);
     }
 
     @Override
diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
index 074f9ad1..b316f7d3 100644
--- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
@@ -36,7 +36,7 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
  */
 public class VgsProviderLiveTest extends AbstractProviderLiveTest {
     public VgsProviderLiveTest() {
-        super(new VgsProvider());
+        super(new VgsProvider(secretProperty("vgs.api_authorization")));
     }
 
     @Test
diff --git a/enabler/test/de/schildbach/pte/live/secrets.properties.template b/enabler/test/de/schildbach/pte/live/secrets.properties.template
index 5797a811..fa4fda28 100644
--- a/enabler/test/de/schildbach/pte/live/secrets.properties.template
+++ b/enabler/test/de/schildbach/pte/live/secrets.properties.template
@@ -3,8 +3,9 @@ navitia.authorization =
 db.api_authorization =
 bvg.api_authorization =
 nvv.api_authorization =
-vbn.api_authorization =
 sh.api_authorization =
+vbn.api_authorization =
+vgs.api_authorization =
 vmt.api_authorization =
 invg.api_authorization =
 avv_aachen.api_authorization =