diff --git a/pkg/compiler/compiler.go b/pkg/compiler/compiler.go
index 32ce9faf..b12e4a73 100644
--- a/pkg/compiler/compiler.go
+++ b/pkg/compiler/compiler.go
@@ -348,14 +348,14 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
 
 	noBuildInstructions := len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0
 
-	if len(p.GetPreBuildSteps()) == 0 && !noBuildInstructions {
-		buildertaggedImage = image
-	}
-
 	if len(p.BuildSteps()) == 0 || noBuildInstructions {
 		packageImage = buildertaggedImage
 	}
 
+	if len(p.GetPreBuildSteps()) == 0 {
+		buildertaggedImage = image
+	}
+
 	// Then we write the step image, which uses the builder one
 	if err := p.WriteStepImageDefinition(buildertaggedImage, filepath.Join(buildDir, p.GetPackage().GetFingerPrint()+".dockerfile")); err != nil {
 		return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition")