diff --git a/config.def.h b/config.def.h
index 6d70979..03ea071 100644
--- a/config.def.h
+++ b/config.def.h
@@ -665,11 +665,11 @@
 #define DEFAULT_QUICK_MENU_SHOW_DOWNLOAD_THUMBNAILS true
 #endif
 
-#define DEFAULT_MENU_SHOW_ONLINE_UPDATER true
+#define DEFAULT_MENU_SHOW_ONLINE_UPDATER false
 #if defined(HAVE_LAKKA) || defined(VITA)
 #define DEFAULT_MENU_SHOW_CORE_UPDATER false
 #else
-#define DEFAULT_MENU_SHOW_CORE_UPDATER true
+#define DEFAULT_MENU_SHOW_CORE_UPDATER false
 #endif
 #define DEFAULT_MENU_SHOW_LOAD_CORE true
 #define DEFAULT_MENU_SHOW_LOAD_CONTENT true
@@ -1640,96 +1640,96 @@
 #endif
 
 #if defined(HAKCHI)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(ANDROID)
 #if defined(ANDROID_ARM_V7)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(ANDROID_ARM)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(ANDROID_AARCH64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(ANDROID_X86)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(ANDROID_X64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif defined(__QNX__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(IOS)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/ios/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(OSX)
 #if defined(__x86_64__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__aarch64__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #else
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
 #if _MSC_VER >= 1910
 #ifndef __WINRT__
 #if defined(__x86_64__) || defined(_M_X64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__arm__) || defined(_M_ARM)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__aarch64__) || defined(_M_ARM64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #else
 #if defined(__x86_64__) || defined(_M_X64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__arm__) || defined(_M_ARM)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__aarch64__) || defined(_M_ARM64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #endif
 #elif _MSC_VER == 1600
 #if defined(__x86_64__) || defined(_M_X64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif _MSC_VER == 1400
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif _MSC_VER == 1310
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #else
 #if defined(__x86_64__) || defined(_M_X64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #endif
 #elif defined(__linux__)
 #if defined(__x86_64__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86_64/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 #elif defined(WIIU)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(HAVE_LIBNX)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
+#define DEFAULT_BUILDBOT_SERVER_URL ""
 #elif defined(_3DS)
-#define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/"
+#define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "" : ""
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
 
-#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/"
+#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL ""
 
 #define DEFAULT_DISCORD_APP_ID "475456035851599874"
 
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index f6602e0..9fecc09 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -432,7 +432,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
        get_ios_version(&major, &minor);
        if (major > 8)
           strlcpy(g_defaults.path_buildbot_server_url,
-                "http://buildbot.libretro.com/nightly/apple/ios9/latest/",
+                "",
                 sizeof(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 ebd0167..67c5209 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/qb/config.params.sh b/qb/config.params.sh
index eea2495..0e3441b 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -141,10 +141,10 @@ HAVE_7ZIP=yes              # Compile in 7z support
 HAVE_FLAC=auto             # Compile in flac support
 HAVE_DR_MP3=yes            # Compile in Dr. MP3 support
 HAVE_BUILTINFLAC=auto      # Bake in flac support
-HAVE_ONLINE_UPDATER=yes    # Disable the online updater
-HAVE_UPDATE_CORES=yes      # Disable downloading cores with online updater
-HAVE_UPDATE_CORE_INFO=yes  # Disable downloading cores info with online updater
-HAVE_UPDATE_ASSETS=yes     # Disable downloading assets with online updater
+HAVE_ONLINE_UPDATER=no    # Disable the online updater
+HAVE_UPDATE_CORES=no      # Disable downloading cores with online updater
+HAVE_UPDATE_CORE_INFO=no  # Disable downloading cores info with online updater
+HAVE_UPDATE_ASSETS=no     # Disable downloading assets with online updater
 HAVE_PRESERVE_DYLIB=no     # Enable dlclose() for Valgrind support
 HAVE_PARPORT=auto          # Parallel port joypad support
 HAVE_IMAGEVIEWER=yes       # Built-in image viewer support.
diff --git a/retroarch.cfg b/retroarch.cfg
index e978dff..d93df7f 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -699,7 +699,7 @@
 #### Menu
 
 # If disabled, will hide 'Online Updater' inside the menu.
-# menu_show_online_updater = true
+menu_show_online_updater = false
 
 # If disabled, will hide the ability to update cores (and core info files) inside the menu.
 # menu_show_core_updater = true
@@ -781,13 +781,13 @@
 #### 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
 
