diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index f846ed2..d60b4fb 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -2437,6 +2437,9 @@ if [[ "${SWRAID}" = "true" ]] ; then
     echo "Cloning EFI partition from ${efidev1} to ${efidev2}"
     dd if="${efidev1}" of="${efidev2}" bs=10M
   fi
+
+  echo "Ensuring ${SWRAID_DEVICE} is stopped"
+  mdadm --stop "${SWRAID_DEVICE}" || true
 fi
 
 if ! blockdev --rereadpt "/dev/${DISK}" ; then