diff --git a/app/build.gradle b/app/build.gradle
index a5f3a70f8..075be2fc3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         versionName '3.9.0-beta'
         versionCode 119
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
-        buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
+        buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.org"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'
         buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.ooni.org"'
         resValue "string", "APP_ID", 'org.openobservatory.ooniprobe'
@@ -63,14 +63,11 @@ android {
             resValue "string", "APP_ID", 'com.dw.ooniprobe'
             resValue "string", "APP_NAME", "News Media Scan"
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"news-media-scan-android"'
-            buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
             buildConfigField "boolean", "SHOW_DISABLED_CARDS", "false"
         }
         stable {
             dimension 'testing'
             buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android"'
-            buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.prod.ooni.io"'
-            buildConfigField 'String', 'OONI_RUN_DASHBOARD_URL', '"https://run.ooni.org"'
         }
         dev {
             dimension 'testing'
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/domain/MeasurementsManager.java b/app/src/main/java/org/openobservatory/ooniprobe/domain/MeasurementsManager.java
index 4d2b36516..29c4149c3 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/domain/MeasurementsManager.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/domain/MeasurementsManager.java
@@ -58,7 +58,7 @@ public boolean canUpload(Measurement measurement) {
     }
 
     public String getExplorerUrl(Measurement measurement) {
-        String url = "https://explorer.ooni.io/measurement/" + measurement.report_id;
+        String url = "https://explorer.ooni.org/measurement/" + measurement.report_id;
         if (measurement.test_name.equals("web_connectivity"))
             url = url + "?input=" + measurement.url.url;
         return url;
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding2Fragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding2Fragment.java
index fddbc294b..4f02668af 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding2Fragment.java
+++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding2Fragment.java
@@ -31,7 +31,7 @@ void masterClick() {
 	}
 
 	void slaveClick() {
-		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.io/about/risks/")));
+		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://ooni.org/about/risks/")));
 	}
 
 	@Override