diff --git a/binfmt/Kconfig b/binfmt/Kconfig
index 55871071760b0..7f6e3cfbfcc8d 100644
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@@ -51,6 +51,7 @@ config ELF
 	default n
 	select BINFMT_LOADABLE
 	select LIBC_ARCH_ELF
+	select ARCH_USE_TEXT_HEAP if ARCH_HAVE_TEXT_HEAP
 	---help---
 		Enable support for the ELF binary format.  Default: n
 
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig
index 70ab9856e10cb..9db821d235394 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/elf/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=8192
 CONFIG_ARCH_RISCV=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_USE_TEXT_HEAP=y
 CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=15000
 CONFIG_BUILTIN=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig
index e6367feb287dc..01db1c6438c8e 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/elf/defconfig
@@ -16,7 +16,6 @@ CONFIG_ARCH_CHIP="esp32"
 CONFIG_ARCH_CHIP_ESP32=y
 CONFIG_ARCH_CHIP_ESP32WROVER=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_USE_TEXT_HEAP=y
 CONFIG_ARCH_XTENSA=y
 CONFIG_BINFMT_CONSTRUCTORS=y
 CONFIG_BOARDCTL_ROMDISK=y