diff --git a/boot/bootutil/src/swap_priv.h b/boot/bootutil/src/swap_priv.h
index 2734d6262..719960f21 100644
--- a/boot/bootutil/src/swap_priv.h
+++ b/boot/bootutil/src/swap_priv.h
@@ -107,7 +107,7 @@ static inline size_t boot_scratch_area_size(const struct boot_loader_state *stat
 int app_max_size(struct boot_loader_state *state);
 
 #if defined(PM_S1_ADDRESS) && !defined(MCUBOOT_OVERWRITE_ONLY) && \
-(CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1 || defined(LEGACY_CHILD_PARENT_S0_S1_UPDATE_ENABLED))
+CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
 /**
  * Performs an NSIB update
  */
diff --git a/boot/zephyr/pm.yml b/boot/zephyr/pm.yml
index 13ffc44aa..ab8f6d1c3 100644
--- a/boot/zephyr/pm.yml
+++ b/boot/zephyr/pm.yml
@@ -4,9 +4,7 @@ mcuboot:
   size: CONFIG_PM_PARTITION_SIZE_MCUBOOT
   placement:
     before: [mcuboot_primary]
-#if defined(CONFIG_HIDE_CHILD_PARENT_CONFIG)
     align: {end: 0x1000}
-#endif
 
 mcuboot_primary_app:
   # All images to be placed in MCUboot's slot 0 should be placed in this