diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28ea07ed..c1998544 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ workflows:
           executor-image: ubuntu-2204:2023.04.2
           working-directory: apps/java-maven
           image-name: cnbs/circleci-sample
-          builder: 'cnbs/sample-builder:noble'
+          builder: 'cnbs/sample-builder:resolute'
           version: '0.32.1'
       - test:
           requires:
diff --git a/Makefile b/Makefile
index e8eb32e8..aa0eec37 100644
--- a/Makefile
+++ b/Makefile
@@ -10,33 +10,33 @@ clean: clean-linux
 
 build-linux: build-linux-bases build-linux-packages build-linux-builders build-linux-buildpacks
 
-build-linux-bases: build-base-alpine build-base-noble
+build-linux-bases: build-base-alpine build-base-resolute
 
 build-alpine: build-base-alpine build-builder-alpine build-buildpacks-alpine
 
-build-noble: build-base-noble build-builder-noble build-buildpacks-noble
+build-resolute: build-base-resolute build-builder-resolute build-buildpacks-resolute
 
 build-base-alpine:
 	@echo "> Building 'alpine' base images..."
 	${PACK_CMD} config experimental true
 	bash base-images/build.sh alpine
 
-build-base-noble:
-	@echo "> Building 'noble' base images..."
+build-base-resolute:
+	@echo "> Building 'resolute' base images..."
 	${PACK_CMD} config experimental true
-	bash base-images/build.sh noble
+	bash base-images/build.sh resolute
 
-build-linux-builders: build-builder-alpine build-builder-noble
+build-linux-builders: build-builder-alpine build-builder-resolute
 
 build-builder-alpine: build-linux-packages build-sample-root
 	@echo "> Building 'alpine' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:alpine --config $(SAMPLES_ROOT)/builders/alpine/builder.toml $(PULL_POLICY_NEVER)
 
-build-builder-noble: build-linux-packages build-sample-root
-	@echo "> Building 'noble' builder..."
-	$(PACK_CMD) builder create cnbs/sample-builder:noble --config $(SAMPLES_ROOT)/builders/noble/builder.toml $(PULL_POLICY_NEVER)
+build-builder-resolute: build-linux-packages build-sample-root
+	@echo "> Building 'resolute' builder..."
+	$(PACK_CMD) builder create cnbs/sample-builder:resolute --config $(SAMPLES_ROOT)/builders/resolute/builder.toml $(PULL_POLICY_NEVER)
 
-build-linux-buildpacks: build-buildpacks-alpine build-buildpacks-noble
+build-linux-buildpacks: build-buildpacks-alpine build-buildpacks-resolute
 
 build-buildpacks-alpine: build-sample-root
 	@echo "> Starting local registry to store alpine builder (when builder contains extensions it must exist in a registry so that builds can use --pull-policy=always and we don't want to override the locally built builder)"
@@ -60,24 +60,24 @@ build-buildpacks-alpine: build-sample-root
 	@echo "> Creating 'kotlin-gradle' app using 'alpine' builder..."
 	$(PACK_CMD) build sample-kotlin-gradle-app:alpine -v --builder localhost:5000/cnbs/sample-builder:alpine --path apps/kotlin-gradle --network=host
 
-build-buildpacks-noble: build-sample-root
-	@echo "> Creating 'hello-moon' app using 'noble' builder..."
-	$(PACK_CMD) build sample-hello-moon-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon $(PACK_BUILD_FLAGS)
+build-buildpacks-resolute: build-sample-root
+	@echo "> Creating 'hello-moon' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-hello-moon-app:resolute -v --builder cnbs/sample-builder:resolute --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world --buildpack $(SAMPLES_ROOT)/buildpacks/hello-moon $(PACK_BUILD_FLAGS)
 
-	@echo "> Creating 'hello-processes' app using 'noble' builder..."
-	$(PACK_CMD) build sample-hello-processes-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-processes $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'hello-processes' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-hello-processes-app:resolute -v --builder cnbs/sample-builder:resolute --buildpack $(SAMPLES_ROOT)/buildpacks/hello-processes $(PACK_BUILD_FLAGS)
 
-	@echo "> Creating 'hello-world' app using 'noble' builder..."
-	$(PACK_CMD) build sample-hello-world-app:noble -v --builder cnbs/sample-builder:noble --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world  $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'hello-world' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-hello-world-app:resolute -v --builder cnbs/sample-builder:resolute --buildpack $(SAMPLES_ROOT)/buildpacks/hello-world  $(PACK_BUILD_FLAGS)
 
-	@echo "> Creating 'java-maven' app using 'noble' builder..."
-	$(PACK_CMD) build sample-java-maven-app:noble -v --builder cnbs/sample-builder:noble --path apps/java-maven $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'java-maven' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-java-maven-app:resolute -v --builder cnbs/sample-builder:resolute --path apps/java-maven $(PACK_BUILD_FLAGS)
 
-	@echo "> Creating 'kotlin-gradle' app using 'noble' builder..."
-	$(PACK_CMD) build sample-kotlin-gradle-app:noble -v --builder cnbs/sample-builder:noble --path apps/kotlin-gradle $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'kotlin-gradle' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-kotlin-gradle-app:resolute -v --builder cnbs/sample-builder:resolute --path apps/kotlin-gradle $(PACK_BUILD_FLAGS)
 
-	@echo "> Creating 'ruby-bundler' app using 'noble' builder..."
-	$(PACK_CMD) build sample-ruby-bundler-app:noble -v --builder cnbs/sample-builder:noble --path apps/ruby-bundler $(PACK_BUILD_FLAGS)
+	@echo "> Creating 'ruby-bundler' app using 'resolute' builder..."
+	$(PACK_CMD) build sample-ruby-bundler-app:resolute -v --builder cnbs/sample-builder:resolute --path apps/ruby-bundler $(PACK_BUILD_FLAGS)
 
 build-linux-packages: build-sample-root
 	@echo "> Creating 'hello-world' buildpack package"
@@ -94,10 +94,10 @@ deploy-linux-bases:
 	docker push cnbs/sample-base-run:alpine
 	docker push cnbs/sample-base-build:alpine
 
-	@echo "> Deploying 'noble' base images..."
-	docker push cnbs/sample-base:noble
-	docker push cnbs/sample-base-run:noble
-	docker push cnbs/sample-base-build:noble
+	@echo "> Deploying 'resolute' base images..."
+	docker push cnbs/sample-base:resolute
+	docker push cnbs/sample-base-run:resolute
+	docker push cnbs/sample-base-build:resolute
 
 deploy-linux-packages:
 	@echo "> Deploying linux packages..."
@@ -109,8 +109,8 @@ deploy-linux-builders:
 	docker run cnbs/sample-builder:alpine ls /cnb/extensions/samples_curl || true
 	docker push cnbs/sample-builder:alpine
 
-	@echo "> Deploying 'noble' builder..."
-	docker push cnbs/sample-builder:noble
+	@echo "> Deploying 'resolute' builder..."
+	docker push cnbs/sample-builder:resolute
 
 clean-linux:
 	@echo "> Removing 'alpine' base images..."
@@ -118,14 +118,14 @@ clean-linux:
 	docker rmi cnbs/sample-base-run:alpine || true
 	docker rmi cnbs/sample-base-build:alpine || true
 
-	@echo "> Removing 'noble' base images..."
-	docker rmi cnbs/sample-base:noble || true
-	docker rmi cnbs/sample-base-run:noble || true
-	docker rmi cnbs/sample-base-build:noble || true
+	@echo "> Removing 'resolute' base images..."
+	docker rmi cnbs/sample-base:resolute || true
+	docker rmi cnbs/sample-base-run:resolute || true
+	docker rmi cnbs/sample-base-build:resolute || true
 
 	@echo "> Removing builders..."
 	docker rmi cnbs/sample-builder:alpine || true
-	docker rmi cnbs/sample-builder:noble || true
+	docker rmi cnbs/sample-builder:resolute || true
 
 	@echo "> Removing 'alpine' apps..."
 	docker rmi sample-hello-moon-app:alpine || true
@@ -134,13 +134,13 @@ clean-linux:
 	docker rmi sample-java-maven-app:alpine || true
 	docker rmi sample-kotlin-gradle-app:alpine || true
 
-	@echo "> Removing 'noble' apps..."
-	docker rmi sample-hello-moon-app:noble || true
-	docker rmi sample-hello-processes-app:noble || true
-	docker rmi sample-hello-world-app:noble || true
-	docker rmi sample-java-maven-app:noble || true
-	docker rmi sample-kotlin-gradle-app:noble || true
-	docker rmi sample-ruby-bundler-app:noble || true
+	@echo "> Removing 'resolute' apps..."
+	docker rmi sample-hello-moon-app:resolute || true
+	docker rmi sample-hello-processes-app:resolute || true
+	docker rmi sample-hello-world-app:resolute || true
+	docker rmi sample-java-maven-app:resolute || true
+	docker rmi sample-kotlin-gradle-app:resolute || true
+	docker rmi sample-ruby-bundler-app:resolute || true
 
 	@echo "> Removing packages..."
 	docker rmi cnbs/sample-package:hello-world || true
diff --git a/apps/README.md b/apps/README.md
index 5501d5fc..445b3c3b 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -10,7 +10,7 @@
 To build images for most of these apps, simply execute:
 
 ```bash
-pack build -p apps/<APP> --builder cnbs/sample-builder:<noble OR alpine> sample-app
+pack build -p apps/<APP> --builder cnbs/sample-builder:<resolute OR alpine> sample-app
 ```
 
 _After building the app you should be able to simply run it via `docker run -it -p 8080:8080 sample-app`.
diff --git a/apps/bash-script/README.md b/apps/bash-script/README.md
index 0f2037ca..c897d075 100644
--- a/apps/bash-script/README.md
+++ b/apps/bash-script/README.md
@@ -11,7 +11,7 @@ pack build sample-bash-script-app --builder cnbs/sample-builder:alpine
 OR
 
 ```bash
-pack build sample-bash-script-app --builder cnbs/sample-builder:noble
+pack build sample-bash-script-app --builder cnbs/sample-builder:resolute
 ```
 
 ### Extended Functionality
diff --git a/base-images/README.md b/base-images/README.md
index f4b927c2..8fac07de 100755
--- a/base-images/README.md
+++ b/base-images/README.md
@@ -17,7 +17,7 @@ Usage:
 Example:
 
 ```bash
-./build-stack.sh noble
+./build-stack.sh resolute
 ```
 
 To use this stack see the [sample builders](../builders)
diff --git a/base-images/noble/base/Dockerfile b/base-images/resolute/base/Dockerfile
similarity index 97%
rename from base-images/noble/base/Dockerfile
rename to base-images/resolute/base/Dockerfile
index f36239b1..6f821e20 100755
--- a/base-images/noble/base/Dockerfile
+++ b/base-images/resolute/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:resolute
 
 # Workaround for docker <= 20.10.9
 RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-clean
diff --git a/base-images/noble/build/Dockerfile b/base-images/resolute/build/Dockerfile
similarity index 100%
rename from base-images/noble/build/Dockerfile
rename to base-images/resolute/build/Dockerfile
diff --git a/base-images/noble/build/bin/yj-linux b/base-images/resolute/build/bin/yj-linux
similarity index 100%
rename from base-images/noble/build/bin/yj-linux
rename to base-images/resolute/build/bin/yj-linux
diff --git a/base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override b/base-images/resolute/build/cnb/build-config/env/PIP_INDEX_URL.override
similarity index 100%
rename from base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override
rename to base-images/resolute/build/cnb/build-config/env/PIP_INDEX_URL.override
diff --git a/base-images/noble/run/Dockerfile b/base-images/resolute/run/Dockerfile
similarity index 100%
rename from base-images/noble/run/Dockerfile
rename to base-images/resolute/run/Dockerfile
diff --git a/builders/README.md b/builders/README.md
index 859808f8..19edaf84 100644
--- a/builders/README.md
+++ b/builders/README.md
@@ -4,7 +4,7 @@ A sample of builders that use the [base images](../base-images/) in this repo.
 
 ### Contains:
 - [Alpine](alpine/)
-- [noble](noble/)
+- [resolute](resolute/)
 
 ### Additional Resources
 
diff --git a/builders/noble/README.md b/builders/resolute/README.md
similarity index 64%
rename from builders/noble/README.md
rename to builders/resolute/README.md
index 1ded9c65..635f360a 100644
--- a/builders/noble/README.md
+++ b/builders/resolute/README.md
@@ -1,4 +1,4 @@
-# Sample noble Builder
+# Sample resolute Builder
 
 ### Prerequisites
 * [Pack](https://buildpacks.io/docs/install-pack/)
@@ -8,13 +8,13 @@
 #### Creating the builder
 
 ```bash
-pack builder create cnbs/sample-builder:noble --config builder.toml
+pack builder create cnbs/sample-builder:resolute --config builder.toml
 ```
 
 #### Build app with builder
 
 ```bash
-pack build sample-app --builder cnbs/sample-builder:noble --path ../../apps/java-maven/
+pack build sample-app --builder cnbs/sample-builder:resolute --path ../../apps/java-maven/
 ```
 
 _After building the app you should be able to simply run it via `docker run -it -p 8080:8080 sample-app`.
diff --git a/builders/noble/builder.toml b/builders/resolute/builder.toml
similarity index 91%
rename from builders/noble/builder.toml
rename to builders/resolute/builder.toml
index 97cfc521..5a653a48 100644
--- a/builders/noble/builder.toml
+++ b/builders/resolute/builder.toml
@@ -40,10 +40,10 @@ version = "0.0.2"
 
 # Base images used to create the builder
 [build]
-image = "cnbs/sample-base-build:noble"
+image = "cnbs/sample-base-build:resolute"
 [run]
 [[run.images]]
-image = "cnbs/sample-base-run:noble"
+image = "cnbs/sample-base-run:resolute"
 
 [[targets]]
 arch = "amd64"
diff --git a/buildpacks/hello-moon/README.md b/buildpacks/hello-moon/README.md
index d1505c97..68bdc6dd 100644
--- a/buildpacks/hello-moon/README.md
+++ b/buildpacks/hello-moon/README.md
@@ -11,5 +11,5 @@ pack build sample-hello-moon-app --builder cnbs/sample-builder:alpine --buildpac
 OR
 
 ```bash
-pack build sample-hello-moon-app --builder cnbs/sample-builder:noble --buildpack ../hello-world/ --buildpack .
+pack build sample-hello-moon-app --builder cnbs/sample-builder:resolute --buildpack ../hello-world/ --buildpack .
 ```
diff --git a/buildpacks/hello-processes/README.md b/buildpacks/hello-processes/README.md
index 2e764526..b27dc6fe 100644
--- a/buildpacks/hello-processes/README.md
+++ b/buildpacks/hello-processes/README.md
@@ -14,7 +14,7 @@ pack build sample-hello-processes-app --builder cnbs/sample-builder:alpine  --bu
 OR
 
 ```bash
-pack build sample-hello-processes-app --builder cnbs/sample-builder:noble --buildpack ../java-maven --buildpack . --path ../../apps/java-maven
+pack build sample-hello-processes-app --builder cnbs/sample-builder:resolute --buildpack ../java-maven --buildpack . --path ../../apps/java-maven
 ```
 
 #### Run
diff --git a/buildpacks/hello-universe/README.md b/buildpacks/hello-universe/README.md
index 6658f8d8..334c2b50 100644
--- a/buildpacks/hello-universe/README.md
+++ b/buildpacks/hello-universe/README.md
@@ -16,7 +16,7 @@ OR
 
 ```bash
 pack build sample-hello-universe-app \
-    --builder cnbs/sample-builder:noble \
+    --builder cnbs/sample-builder:resolute \
     --buildpack . \
     --buildpack ../hello-world/ \
     --buildpack ../hello-moon/
diff --git a/buildpacks/hello-world/README.md b/buildpacks/hello-world/README.md
index 376a338a..c928f261 100644
--- a/buildpacks/hello-world/README.md
+++ b/buildpacks/hello-world/README.md
@@ -11,7 +11,7 @@ pack build sample-hello-world-app --builder cnbs/sample-builder:alpine --buildpa
 OR
 
 ```bash
-pack build sample-hello-world-app --builder cnbs/sample-builder:noble --buildpack .
+pack build sample-hello-world-app --builder cnbs/sample-builder:resolute --buildpack .
 ```
 
 THEN
diff --git a/buildpacks/java-maven/README.md b/buildpacks/java-maven/README.md
index 802479e0..fbf44caf 100644
--- a/buildpacks/java-maven/README.md
+++ b/buildpacks/java-maven/README.md
@@ -12,5 +12,5 @@ pack build sample-java-maven-app --builder cnbs/sample-builder:alpine --buildpac
 OR
 
 ```bash
-pack build sample-java-maven-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/java-maven
+pack build sample-java-maven-app --builder cnbs/sample-builder:resolute --buildpack . --path ../../apps/java-maven
 ```
\ No newline at end of file
diff --git a/buildpacks/kotlin-gradle/README.md b/buildpacks/kotlin-gradle/README.md
index 68b4c433..64447d85 100644
--- a/buildpacks/kotlin-gradle/README.md
+++ b/buildpacks/kotlin-gradle/README.md
@@ -12,5 +12,5 @@ pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:alpine --build
 OR
 
 ```bash
-pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/kotlin-gradle
+pack build sample-kotlin-gradle-app --builder cnbs/sample-builder:resolute --buildpack . --path ../../apps/kotlin-gradle
 ```
\ No newline at end of file
diff --git a/buildpacks/ruby-bundler/README.md b/buildpacks/ruby-bundler/README.md
index 11576195..5f2588fe 100644
--- a/buildpacks/ruby-bundler/README.md
+++ b/buildpacks/ruby-bundler/README.md
@@ -6,5 +6,5 @@ Compatible apps:
 ### Usage
 
 ```bash
-pack build sample-ruby-bundler-app --builder cnbs/sample-builder:noble --buildpack . --path ../../apps/ruby-bundler
+pack build sample-ruby-bundler-app --builder cnbs/sample-builder:resolute --buildpack . --path ../../apps/ruby-bundler
 ```
\ No newline at end of file