diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
index 3285416be..ec86ea053 100644
--- a/boot/zephyr/Kconfig
+++ b/boot/zephyr/Kconfig
@@ -408,6 +408,7 @@ config BOOT_VALIDATE_SLOT0_ONCE
 
 config BOOT_PREFER_SWAP_OFFSET
 	bool "Prefer the newer swap offset algorithm"
+	default y if !$(dt_nodelabel_enabled,scratch_partition) && !SOC_FAMILY_STM32
 	help
 	  If y, the BOOT_IMAGE_UPGRADE_MODE will default to using "offset" instead of "scratch".
 	  This is a separate bool config option, because Kconfig doesn't allow defaults to be
@@ -415,7 +416,7 @@ config BOOT_PREFER_SWAP_OFFSET
 
 config BOOT_PREFER_SWAP_MOVE
 	bool "Prefer the newer swap move algorithm"
-	default y if SOC_FAMILY_NORDIC_NRF
+	depends on !BOOT_PREFER_SWAP_OFFSET
 	default y if !$(dt_nodelabel_enabled,scratch_partition)
 	help
 	  If y, the BOOT_IMAGE_UPGRADE_MODE will default to using
diff --git a/boot/zephyr/boards/ctcc_nrf52840.conf b/boot/zephyr/boards/ctcc_nrf52840.conf
index ec8ea7f9f..5cbe290f6 100644
--- a/boot/zephyr/boards/ctcc_nrf52840.conf
+++ b/boot/zephyr/boards/ctcc_nrf52840.conf
@@ -18,3 +18,6 @@ CONFIG_MULTITHREADING=y
 # USB
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
+
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y
diff --git a/boot/zephyr/boards/decawave_dwm3001cdk.conf b/boot/zephyr/boards/decawave_dwm3001cdk.conf
new file mode 100644
index 000000000..13013eaeb
--- /dev/null
+++ b/boot/zephyr/boards/decawave_dwm3001cdk.conf
@@ -0,0 +1,2 @@
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y
diff --git a/boot/zephyr/boards/it8xxx2_evb.conf b/boot/zephyr/boards/it8xxx2_evb.conf
new file mode 100644
index 000000000..13013eaeb
--- /dev/null
+++ b/boot/zephyr/boards/it8xxx2_evb.conf
@@ -0,0 +1,2 @@
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y
diff --git a/boot/zephyr/boards/micromod_nrf52840..conf b/boot/zephyr/boards/micromod_nrf52840..conf
new file mode 100644
index 000000000..13013eaeb
--- /dev/null
+++ b/boot/zephyr/boards/micromod_nrf52840..conf
@@ -0,0 +1,2 @@
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y
diff --git a/boot/zephyr/boards/myra_sip_baseboard.conf b/boot/zephyr/boards/myra_sip_baseboard.conf
new file mode 100644
index 000000000..13013eaeb
--- /dev/null
+++ b/boot/zephyr/boards/myra_sip_baseboard.conf
@@ -0,0 +1,2 @@
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y
diff --git a/boot/zephyr/boards/numaker_pfm_m467.conf b/boot/zephyr/boards/numaker_pfm_m467.conf
new file mode 100644
index 000000000..13013eaeb
--- /dev/null
+++ b/boot/zephyr/boards/numaker_pfm_m467.conf
@@ -0,0 +1,2 @@
+# Partitions set up for swap using move
+CONFIG_BOOT_PREFER_SWAP_MOVE=y