diff --git a/internal/apps/builder/cnb.go b/internal/apps/builder/cnb.go
index 73ec909b4..ac6d0b008 100644
--- a/internal/apps/builder/cnb.go
+++ b/internal/apps/builder/cnb.go
@@ -380,10 +380,10 @@ func (b *CNBComponentBuilder) builderImage() string {
 		return b.builderImageOverride
 	}
 	for _, f := range b.spec.Features {
-		if strings.EqualFold(f, "buildpack-stack=ubuntu-22") {
-			return CNBBuilderImage_Heroku22
+		if strings.EqualFold(f, "buildpack-stack=ubuntu-18") {
+			return CNBBuilderImage_Heroku18
 		}
 	}
 
-	return CNBBuilderImage_Heroku18
+	return CNBBuilderImage_Heroku22
 }