diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 22d326a371e..f920480b835 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -87,27 +87,23 @@ print_logs () {
 }
 
 declare -i max_restore_container_tries=3
-current_iteration=
 
 restore_container () {
 	CHECKPOINT_NAME=$1
 
-	docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log || {
-		# FIXME: There is a race condition in docker/containerd that causes
-		# docker to occasionally fail when starting a container from a
-		# checkpoint immediately after the checkpoint has been created.
-		# https://github.com/moby/moby/issues/42900
-		if [ "$current_iteration" -gt "$max_restore_container_tries" ]; then
+	for i in $(seq $max_restore_container_tries); do
+		docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log && break || {
+			# FIXME: There is a race condition in docker/containerd that causes
+			# docker to occasionally fail when starting a container from a
+			# checkpoint immediately after the checkpoint has been created.
+			# https://github.com/moby/moby/issues/42900
+			grep -Eq '^Error response from daemon: failed to upload checkpoint to containerd: commit failed: content sha256:.*: already exists$' log && {
+				echo "Retry container restore: $i/$max_restore_container_tries"
+				sleep 1;
+			} ||
 			print_logs
-		fi
-		grep -Eq '^Error response from daemon: failed to upload checkpoint to containerd: commit failed: content sha256:.*: already exists$' log && {
-			((current_iteration+=1))
-			echo "Retry container restore: $current_iteration"
-			sleep 1;
-			restore_container "$CHECKPOINT_NAME"
-		} ||
-		print_logs
-	} && current_iteration=0
+		}
+	done
 }
 
 # Scenario: Create multiple containers and checkpoint and restore them once