diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..1234ca6bb
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+test-connection.yaml
\ No newline at end of file
diff --git a/deploy/docker-compose/Tiltfile b/deploy/docker-compose/Tiltfile
index 6d1530475..e91625535 100644
--- a/deploy/docker-compose/Tiltfile
+++ b/deploy/docker-compose/Tiltfile
@@ -7,38 +7,14 @@ os.putenv ( 'MYSQL_PASSWORD' , random_password )
 
 docker_compose('docker-compose.yml')
 
-custom_build(
-  'retail-store-sample-assets',
-  '../../scripts/build-image.sh -s assets --expected-ref $EXPECTED_REF',
-  ['../../src/assets'],
-)
-
-custom_build(
-  'retail-store-sample-ui',
-  '../../scripts/build-image.sh -s ui --expected-ref $EXPECTED_REF',
-  ['../../src/ui', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-cart',
-  '../../scripts/build-image.sh -s cart --expected-ref $EXPECTED_REF',
-  ['../../src/cart', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-orders',
-  '../../scripts/build-image.sh -s orders --expected-ref $EXPECTED_REF',
-  ['../../src/orders', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-checkout',
-  '../../scripts/build-image.sh -s checkout --expected-ref $EXPECTED_REF',
-  ['../../src/checkout', '../../images/nodejs'],
-)
-
-custom_build(
-  'retail-store-sample-catalog',
-  '../../scripts/build-image.sh -s catalog --expected-ref $EXPECTED_REF',
-  ['../../src/catalog', '../../images/go'],
-)
\ No newline at end of file
+docker_build('retail-store-sample-assets', '../../src/assets')
+
+docker_build('retail-store-sample-ui', '../../src/ui')
+
+docker_build('retail-store-sample-cart', '../../src/cart')
+
+docker_build('retail-store-sample-orders', '../../src/orders')
+
+docker_build('retail-store-sample-checkout', '../../src/checkout')
+
+docker_build('retail-store-sample-catalog', '../../src/catalog')
\ No newline at end of file
diff --git a/deploy/kubernetes/Tiltfile b/deploy/kubernetes/Tiltfile
index 1cfa781bc..5af984d4d 100644
--- a/deploy/kubernetes/Tiltfile
+++ b/deploy/kubernetes/Tiltfile
@@ -17,40 +17,16 @@ def helmfile(file):
 
 k8s_yaml(helmfile("charts/helmfile.yaml"))
 
-custom_build(
-  'retail-store-sample-assets',
-  '../../scripts/build-image.sh -s assets --expected-ref $EXPECTED_REF',
-  ['../../src/assets'],
-)
-
-custom_build(
-  'retail-store-sample-ui',
-  '../../scripts/build-image.sh -s ui --expected-ref $EXPECTED_REF',
-  ['../../src/ui', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-cart',
-  '../../scripts/build-image.sh -s cart --expected-ref $EXPECTED_REF',
-  ['../../src/cart', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-orders',
-  '../../scripts/build-image.sh -s orders --expected-ref $EXPECTED_REF',
-  ['../../src/orders', '../../images/java17'],
-)
-
-custom_build(
-  'retail-store-sample-checkout',
-  '../../scripts/build-image.sh -s checkout --expected-ref $EXPECTED_REF',
-  ['../../src/checkout', '../../images/nodejs'],
-)
-
-custom_build(
-  'retail-store-sample-catalog',
-  '../../scripts/build-image.sh -s catalog --expected-ref $EXPECTED_REF',
-  ['../../src/catalog', '../../images/go'],
-)
+docker_build('retail-store-sample-assets', '../../src/assets')
+
+docker_build('retail-store-sample-ui', '../../src/ui')
+
+docker_build('retail-store-sample-cart', '../../src/cart')
+
+docker_build('retail-store-sample-orders', '../../src/orders')
+
+docker_build('retail-store-sample-checkout', '../../src/checkout')
+
+docker_build('retail-store-sample-catalog', '../../src/catalog')
 
 k8s_resource('ui', port_forwards='8888:8080')
\ No newline at end of file
diff --git a/deploy/kubernetes/charts/carts/templates/tests/test-connection.yaml b/deploy/kubernetes/charts/carts/templates/tests/test-connection.yaml
index f4edbc6d5..f9db191fb 100644
--- a/deploy/kubernetes/charts/carts/templates/tests/test-connection.yaml
+++ b/deploy/kubernetes/charts/carts/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "carts.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "carts.fullname" . }}:{{ .Values.service.port }}/actuator/health/liveness']
   restartPolicy: Never
diff --git a/deploy/kubernetes/charts/catalog/templates/tests/test-connection.yaml b/deploy/kubernetes/charts/catalog/templates/tests/test-connection.yaml
index e2c9fc1b0..3024c2215 100644
--- a/deploy/kubernetes/charts/catalog/templates/tests/test-connection.yaml
+++ b/deploy/kubernetes/charts/catalog/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "catalog.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "catalog.fullname" . }}:{{ .Values.service.port }}/health']
   restartPolicy: Never
diff --git a/deploy/kubernetes/charts/checkout/templates/tests/test-connection.yaml b/deploy/kubernetes/charts/checkout/templates/tests/test-connection.yaml
index 7642b443d..7ef6a1bd6 100644
--- a/deploy/kubernetes/charts/checkout/templates/tests/test-connection.yaml
+++ b/deploy/kubernetes/charts/checkout/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "checkout.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "checkout.fullname" . }}:{{ .Values.service.port }}/health']
   restartPolicy: Never
diff --git a/deploy/kubernetes/charts/orders/templates/tests/test-connection.yaml b/deploy/kubernetes/charts/orders/templates/tests/test-connection.yaml
index c3fc3508e..2f43fb24d 100644
--- a/deploy/kubernetes/charts/orders/templates/tests/test-connection.yaml
+++ b/deploy/kubernetes/charts/orders/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "orders.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "orders.fullname" . }}:{{ .Values.service.port }}/actuator/health/liveness']
   restartPolicy: Never
diff --git a/deploy/kubernetes/charts/ui/templates/tests/test-connection.yaml b/deploy/kubernetes/charts/ui/templates/tests/test-connection.yaml
index 7cf4fb24f..d000cee73 100644
--- a/deploy/kubernetes/charts/ui/templates/tests/test-connection.yaml
+++ b/deploy/kubernetes/charts/ui/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "ui.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "ui.fullname" . }}:{{ .Values.service.port }}/actuator/health/liveness']
   restartPolicy: Never