diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index a5b01fb67e..6a66752926 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -475,7 +475,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
        int major, minor;
        get_ios_version(&major, &minor);
        if (major > 8)
-          strcpy_literal(g_defaults.path_buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/");
+          strcpy_literal(g_defaults.path_buildbot_server_url, "");
     }
 #endif
 
diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
index 48e0354aa6..6dc8fc9702 100644
--- a/libretro-common/samples/net/net_http_test.c
+++ b/libretro-common/samples/net/net_http_test.c
@@ -37,7 +37,7 @@ int main(void)
    if (!network_init())
       return -1;
 
-   http1 = net_http_new("http://buildbot.libretro.com/nightly/windows/x86_64/latest/mednafen_psx_libretro.dll.zip");
+   http1 = net_http_new("");
 
    while (!net_http_update(http1, &pos, &tot))
       printf("%.9lu / %.9lu        \r",pos,tot);
diff --git a/retroarch.cfg b/retroarch.cfg
index 21d91ab1ef..fa99900f4d 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -729,13 +729,13 @@ menu_show_core_updater = false
 #### Core Updater
 
 # URL to core update directory on buildbot.
-# core_updater_buildbot_url = "http://buildbot.libretro.com"
+core_updater_buildbot_url = ""
 
 # URL to assets update directory on buildbot.
-# core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
+core_updater_buildbot_assets_url = ""
 
 # After downloading, automatically extract archives that the downloads are contained inside.
-# core_updater_auto_extract_archive = true
+core_updater_auto_extract_archive = false
 
 #### Network