diff --git a/arch/Kconfig b/arch/Kconfig
index 909c59b7aa01c7..1d06d4745a5dec 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1085,3 +1085,17 @@ config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 	help
 	  This options allows applications to override the default arch idle implementation with
 	  a custom one.
+
+config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
+	bool
+	help
+	  It's possible that an architecture port cannot use _Swap() to swap to
+	  the _main() thread, but instead must do something custom. It must
+	  enable this option in that case.
+
+config ARCH_HAS_CUSTOM_BUSY_WAIT
+	bool
+	help
+	  It's possible that an architecture port cannot or does not want to use
+	  the provided k_busy_wait(), but instead must do something custom. It must
+	  enable this option in that case.
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 0a5e1305f910a7..d8f5c95c3cf430 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -752,13 +752,6 @@ endif # KERNEL_MEM_POOL
 
 endmenu
 
-config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
-	bool
-	help
-	  It's possible that an architecture port cannot use _Swap() to swap to
-	  the _main() thread, but instead must do something custom. It must
-	  enable this option in that case.
-
 config SWAP_NONATOMIC
 	bool
 	help
@@ -771,13 +764,6 @@ config SWAP_NONATOMIC
 	  ARM when the PendSV exception priority sits below that of
 	  Zephyr-handled interrupts.
 
-config ARCH_HAS_CUSTOM_BUSY_WAIT
-	bool
-	help
-	  It's possible that an architecture port cannot or does not want to use
-	  the provided k_busy_wait(), but instead must do something custom. It must
-	  enable this option in that case.
-
 config SYS_CLOCK_TICKS_PER_SEC
 	int "System tick frequency (in ticks/second)"
 	default 100 if QEMU_TARGET || SOC_POSIX