diff --git a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config
index f6c6fcaa36..433a6e89f7 100644
--- a/support/config-fragments/autobuild/bootlin-riscv64-glibc.config
+++ b/support/config-fragments/autobuild/bootlin-riscv64-glibc.config
@@ -1,5 +1,5 @@
 BR2_riscv=y
-BR2_RISCV_ABI_LP64=y
+BR2_RISCV_ABI_LP64D=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y
diff --git a/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/support/config-fragments/autobuild/bootlin-riscv64-musl.config
index 2b6a6e56da..fee1f29f4a 100644
--- a/support/config-fragments/autobuild/bootlin-riscv64-musl.config
+++ b/support/config-fragments/autobuild/bootlin-riscv64-musl.config
@@ -1,4 +1,4 @@
 BR2_riscv=y
-BR2_RISCV_ABI_LP64=y
+BR2_RISCV_ABI_LP64D=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y