diff --git a/toolchain/Config.in b/toolchain/Config.in
index 4a2f91a8b..2d29ec09e 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -41,7 +41,7 @@ menuconfig TARGET_OPTIONS
 		prompt "BPF toolchain" if DEVEL
 		default BPF_TOOLCHAIN_BUILD_LLVM if BUILDBOT
 		default BPF_TOOLCHAIN_PREBUILT if HAS_PREBUILT_LLVM_TOOLCHAIN
-		default BPF_TOOLCHAIN_BUILD_LLVM
+		default BPF_TOOLCHAIN_NONE
 
 		config BPF_TOOLCHAIN_NONE
 			bool "None"
@@ -324,7 +324,7 @@ config USE_LLVM_PREBUILT
 	bool
 
 config USE_LLVM_BUILD
-	default y
+	default y if !DEVEL && BUILDBOT
 	select HAS_BPF_TOOLCHAIN
 	bool