diff --git a/generators/docker/templates/docker/app.yml.ejs b/generators/docker/templates/docker/app.yml.ejs
index c7d90b5c61c..8983854a959 100644
--- a/generators/docker/templates/docker/app.yml.ejs
+++ b/generators/docker/templates/docker/app.yml.ejs
@@ -102,7 +102,7 @@ _%>
       - 127.0.0.1:<%= serverPort %>:<%= serverPort %>
 <%_ } _%>
     healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:<%= serverPort %>/management/health']
+      test: ['CMD', '/workspace/health-check']
       interval: 5s
       timeout: 5s
       retries: 40
diff --git a/generators/spring-boot/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs
index 68bd8d831a8..8f4a60eb984 100644
--- a/generators/spring-boot/templates/build.gradle.ejs
+++ b/generators/spring-boot/templates/build.gradle.ejs
@@ -267,7 +267,10 @@ task cleanResources(type: Delete) {
 bootBuildImage {
     builder = "paketobuildpacks/builder-jammy-buildpackless-tiny"
     buildpacks = ["paketobuildpacks/java"]
-    tags = ["<%- lowercaseBaseName %>"]
+    tags = [
+        "<%- lowercaseBaseName %>"
+        "paketobuildpacks/health-checker"
+    ]
     environment = [
         "BPL_SPRING_AOT_ENABLED" : "true",
         "BP_JVM_CDS_ENABLED" : "false",
diff --git a/generators/spring-boot/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs
index 329a07e7a3e..bd465709d9a 100644
--- a/generators/spring-boot/templates/pom.xml.ejs
+++ b/generators/spring-boot/templates/pom.xml.ejs
@@ -541,6 +541,7 @@
                             <builder>paketobuildpacks/builder-jammy-buildpackless-tiny</builder>
                             <buildpacks>
                                 <buildpack>paketobuildpacks/java</buildpack>
+                                <buildpack>paketobuildpacks/health-checker</buildpack>
                             </buildpacks>
                             <tags>
                                 <tag><%- lowercaseBaseName %></tag>