diff --git a/pkg/compiler/compiler.go b/pkg/compiler/compiler.go
index cb2d7e56..dff040d1 100644
--- a/pkg/compiler/compiler.go
+++ b/pkg/compiler/compiler.go
@@ -350,14 +350,10 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
 		buildertaggedImage = image
 	}
 
-	if len(p.BuildSteps()) == 0 {
+	if len(p.BuildSteps()) == 0 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
 		packageImage = buildertaggedImage
 	}
 
-	if len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
-		packageImage = 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")
@@ -412,7 +408,7 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
 		}
 	}
 
-	if len(p.BuildSteps()) != 0 {
+	if len(p.BuildSteps()) != 0 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
 		Info(pkgTag, ":whale: Generating 'package' image from", buildertaggedImage, "as", packageImage, "with build steps")
 		if err := buildAndPush(runnerOpts); err != nil {
 			return builderOpts, runnerOpts, errors.Wrap(err, "Could not push image: "+image+" "+builderOpts.DockerFileName)