diff --git a/pkg/dockerfile/dockerfile.go b/pkg/dockerfile/dockerfile.go
index 2a4d77454c..03c51b787f 100644
--- a/pkg/dockerfile/dockerfile.go
+++ b/pkg/dockerfile/dockerfile.go
@@ -74,7 +74,7 @@ func baseImageIndex(currentStage int, stages []instructions.Stage) int {
 	currentStageBaseName := strings.ToLower(stages[currentStage].BaseName)
 
 	for i, stage := range stages {
-		if i > currentStage {
+		if i >= currentStage {
 			break
 		}
 		if stage.Name == currentStageBaseName {