diff --git a/arch/risc-v/src/common/espressif/Bootloader.mk b/arch/risc-v/src/common/espressif/Bootloader.mk
index 25d9f15cf8..bc81defebe 100644
--- a/arch/risc-v/src/common/espressif/Bootloader.mk
+++ b/arch/risc-v/src/common/espressif/Bootloader.mk
@@ -35,11 +35,6 @@ MCUBOOT_SRCDIR     = $(BOOTLOADER_SRCDIR)/mcuboot
 MCUBOOT_ESPDIR     = $(MCUBOOT_SRCDIR)/boot/espressif
 MCUBOOT_URL        = https://github.com/mcu-tools/mcuboot
 
-# IDFboot
-
-BLBIN_VERSION = latest
-BLBIN_URL     = https://github.com/espressif/esp-nuttx-bootloader/releases/download/$(BLBIN_VERSION)
-
 # Helpers for creating the configuration file
 
 cfg_en  = echo "$(1)=$(if $(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT),1,y)";
@@ -78,12 +73,6 @@ ifeq ($(CONFIG_ESPRESSIF_BOOTLOADER_MCUBOOT),y)
 		$(if $(CONFIG_UART0_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,0)) \
 		$(if $(CONFIG_UART1_SERIAL_CONSOLE),$(call cfg_val,CONFIG_ESP_CONSOLE_UART_NUM,1)) \
 	} >> $(BOOTLOADER_CONFIG)
-else
-	$(Q) { \
-		$(call cfg_en,CONFIG_PARTITION_TABLE_CUSTOM) \
-		$(call cfg_val,CONFIG_PARTITION_TABLE_CUSTOM_FILENAME,\"partitions.csv\") \
-		$(call cfg_val,CONFIG_PARTITION_TABLE_OFFSET,$(CONFIG_ESPRESSIF_PARTITION_TABLE_OFFSET)) \
-	} >> $(BOOTLOADER_CONFIG)
 endif
 
 ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
@@ -114,17 +103,5 @@ bootloader: $(BOOTLOADER_CONFIG) $(BOOTLOADER_BIN)
 clean_bootloader:
 	$(call DELDIR,$(BOOTLOADER_SRCDIR))
 	$(call DELFILE,$(BOOTLOADER_BIN))
-
-else
-
-bootloader:
-	$(Q) echo "Downloading Bootloader binaries"
-	$(call DOWNLOAD,$(BLBIN_URL),bootloader-$(CHIP_SERIES).bin,$(TOPDIR)/bootloader-$(CHIP_SERIES).bin)
-	$(call DOWNLOAD,$(BLBIN_URL),partition-table-$(CHIP_SERIES).bin,$(TOPDIR)/partition-table-$(CHIP_SERIES).bin)
-
-clean_bootloader:
-	$(call DELFILE,$(TOPDIR)/bootloader-$(CHIP_SERIES).bin)
-	$(call DELFILE,$(TOPDIR)/partition-table-$(CHIP_SERIES).bin)
-
 endif
 endif
diff --git a/arch/risc-v/src/common/espressif/Kconfig b/arch/risc-v/src/common/espressif/Kconfig
index 79c9467dfb..35a1e1014d 100644
--- a/arch/risc-v/src/common/espressif/Kconfig
+++ b/arch/risc-v/src/common/espressif/Kconfig
@@ -200,11 +200,6 @@ config ESPRESSIF_APP_MCUBOOT_HEADER_SIZE
 	default 32
 	depends on ESPRESSIF_BOOTLOADER_MCUBOOT
 
-config ESPRESSIF_PARTITION_TABLE_OFFSET
-	hex "Partition Table offset"
-	default 0x8000
-	depends on !ESPRESSIF_BOOTLOADER_MCUBOOT && !ESPRESSIF_SIMPLE_BOOT
-
 config ESPRESSIF_HAVE_OTA_PARTITION
 	bool
 	default n
diff --git a/tools/espressif/Config.mk b/tools/espressif/Config.mk
index 9700917bcf..3a6b3c9071 100644
--- a/tools/espressif/Config.mk
+++ b/tools/espressif/Config.mk
@@ -72,16 +72,6 @@ ifdef ESPTOOL_BINDIR
 		BOOTLOADER      := $(ESPTOOL_BINDIR)/mcuboot-$(CHIP_SERIES).bin
 		FLASH_BL        := $(BL_OFFSET) $(BOOTLOADER)
 		ESPTOOL_BINS    := $(FLASH_BL)
-	else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
-
-	else
-		BL_OFFSET       := 0x0
-		PT_OFFSET       := $(CONFIG_ESPRESSIF_PARTITION_TABLE_OFFSET)
-		BOOTLOADER      := $(ESPTOOL_BINDIR)/bootloader-$(CHIP_SERIES).bin
-		PARTITION_TABLE := $(ESPTOOL_BINDIR)/partition-table-$(CHIP_SERIES).bin
-		FLASH_BL        := $(BL_OFFSET) $(BOOTLOADER)
-		FLASH_PT        := $(PT_OFFSET) $(PARTITION_TABLE)
-		ESPTOOL_BINS    := $(FLASH_BL) $(FLASH_PT)
 	endif
 endif
 
@@ -105,18 +95,10 @@ else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
 	APP_IMAGE      := nuttx.bin
 	FLASH_APP      := $(APP_OFFSET) $(APP_IMAGE)
 	ESPTOOL_BINDIR := .
-else
-	APP_OFFSET     := 0x10000
-	APP_IMAGE      := nuttx.bin
-	FLASH_APP      := $(APP_OFFSET) $(APP_IMAGE)
 endif
 
 ESPTOOL_BINS += $(FLASH_APP)
 
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-	ESPTOOL_BINS += $(CONFIG_ESPRESSIF_USER_IMAGE_OFFSET) nuttx_user.bin
-endif
-
 # MERGEBIN -- Merge raw binary files into a single file
 
 define MERGEBIN