diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 556f3d01e3..9c0b35d71c 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -32,17 +32,6 @@ config ARCH_CHIP_X86_64_CUSTOM
 
 endchoice
 
-choice
-	prompt "x86_64 system selection"
-	default ARCH_BOARD_QEMU
-
-config ARCH_BOARD_QEMU
-	bool "Qemu environment"
-	---help---
-		Targeting virtualized qemu environment
-
-endchoice
-
 source "arch/x86_64/src/common/Kconfig"
 
 if ARCH_INTEL64
@@ -54,15 +43,6 @@ config ARCH_CHIP
 
 endif # ARCH_INTEL64
 
-if ARCH_BOARD_QEMU
-source "arch/x86_64/src/qemu/Kconfig"
-
-config ARCH_BOARD
-	string
-	default "qemu-intel64"
-
-endif # ARCH_CHIP_QEMU
-
 config ARCH_MULTIBOOT2
 	bool "Append multiboot2 header"
 	default y
diff --git a/boards/Kconfig b/boards/Kconfig
index bedb93ad4e..48cb30b06b 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -3263,7 +3263,7 @@ config ARCH_BOARD
 	default "pic32mx7mmb"               if ARCH_BOARD_PIC32MX7MMB
 	default "pic32mz-starterkit"        if ARCH_BOARD_PIC32MZ_STARTERKIT
 	default "qemu-i486"                 if ARCH_BOARD_QEMU_I486
-	default "intel64-qemu"              if ARCH_BOARD_INTEL64_QEMU
+	default "qemu-intel64"              if ARCH_BOARD_INTEL64_QEMU
 	default "raspberrypi-pico"          if ARCH_BOARD_RASPBERRYPI_PICO
 	default "raspberrypi-pico-w"        if ARCH_BOARD_RASPBERRYPI_PICO_W
 	default "pimoroni-tiny2040"         if ARCH_BOARD_PIMORONI_TINY2040