From 4396dbf5122ed0e056412915c4b559ef6378d4fd Mon Sep 17 00:00:00 2001
From: Elan Hasson <234704+ElanHasson@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:17:20 -0500
Subject: [PATCH 1/2] Set default apps dev build image to
 CNBBuilderImage_Heroku22

---
 internal/apps/builder/cnb.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

From 6952422c9a42a4cfb63d66a7574f862ee05c4f80 Mon Sep 17 00:00:00 2001
From: Elan Hasson <234704+ElanHasson@users.noreply.github.com>
Date: Wed, 20 Dec 2023 07:06:27 -0500
Subject: [PATCH 2/2] Make 18 the default

---
 internal/apps/builder/cnb.go | 5 +++++
 1 file changed, 5 insertions(+)

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