diff --git a/api/server.js b/api/server.js
index e48dc6e..876a338 100644
--- a/api/server.js
+++ b/api/server.js
@@ -71,7 +71,7 @@ app.get('/api/config', (req, res) => {
 });
 app.get('/api/adsb2dd', (req, res) => {
   if (config.truth.adsb.enabled == true) {
-    const api_url = "https://adsb2dd.30hours.dev/api/dd";
+    const api_url = "http://" + config.truth.adsb.adsb2dd + "/api/dd";
     const api_query =
       api_url +
       "?rx=" + config.location.rx.latitude + "," +
@@ -81,7 +81,7 @@ app.get('/api/adsb2dd', (req, res) => {
       config.location.tx.longitude + "," +
       config.location.tx.altitude +
       "&fc=" + (config.capture.fc / 1000000) +
-      "&server=" + "http://" + config.truth.adsb.ip;
+      "&server=" + "http://" + config.truth.adsb.tar1090;
   const jsonResponse = {
     url: api_query
   };
diff --git a/config/config.yml b/config/config.yml
index 59323a9..4638741 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -50,9 +50,9 @@ network:
 
 truth:
   adsb:
-    enabled: false
-    ip: 'adsb.30hours.dev'
-    port: 80
+    enabled: true
+    tar1090: 'adsb.30hours.dev'
+    adsb2dd: 'adsb2dd.30hours.dev'
   ais:
     enabled: false
     ip: 0.0.0.0
diff --git a/config/radar4-usrp.yml b/config/radar4-usrp.yml
index ed070e7..c4a212d 100644
--- a/config/radar4-usrp.yml
+++ b/config/radar4-usrp.yml
@@ -55,8 +55,8 @@ network:
 truth:
   adsb:
     enabled: false
-    ip: 'adsb.30hours.dev'
-    port: 80
+    tar1090: 'adsb.30hours.dev'
+    adsb2dd: 'adsb2dd.30hours.dev'
   ais:
     enabled: false
     ip: 0.0.0.0
diff --git a/config/radar4.yml b/config/radar4.yml
index 59323a9..45ff854 100644
--- a/config/radar4.yml
+++ b/config/radar4.yml
@@ -51,8 +51,8 @@ network:
 truth:
   adsb:
     enabled: false
-    ip: 'adsb.30hours.dev'
-    port: 80
+    tar1090: 'adsb.30hours.dev'
+    adsb2dd: 'adsb2dd.30hours.dev'
   ais:
     enabled: false
     ip: 0.0.0.0
diff --git a/html/js/plot_map.js b/html/js/plot_map.js
index 77571c3..690d91e 100644
--- a/html/js/plot_map.js
+++ b/html/js/plot_map.js
@@ -49,6 +49,9 @@ var configData = $.getJSON(urlConfig, function () { })
     var adsbLinkData = $.getJSON(urlAdsbLink, function () { })
     .done(function (data) {
       urlAdsb = data.url;
+      if (window.location.protocol === 'https:') {
+        urlAdsb = urlAdsb.replace(/^http:/, 'https:');
+      }
     })
   }
 });