diff --git a/auto_upgrade_container.sh b/auto_upgrade_container.sh
index 461a047..f62f070 100755
--- a/auto_upgrade_container.sh
+++ b/auto_upgrade_container.sh
@@ -12,6 +12,8 @@ do
 			update_container "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "$ynh_version" "$snapshot"
 		done
 	done
+	# Remove old runner containers
+	lxc delete -f $(lxc list $PREFIX_IMAGE_NAME-$debian_version-r -c n -f csv)
 done
 
 for debian_version in "bookworm"
@@ -22,6 +24,7 @@ do
 		do
 			update_container "$PREFIX_IMAGE_NAME-$debian_version" "$debian_version" "$ynh_version" "$snapshot"
 		done
-		lxc delete -f $(lxc list $PREFIX_IMAGE_NAME-$debian_version-r -c n -f csv)
 	done
+	# Remove old runner containers
+	lxc delete -f $(lxc list $PREFIX_IMAGE_NAME-$debian_version-r -c n -f csv)
 done