diff --git a/squadquest-supabase/Job/squadquest-supabase-test-analytics.yaml b/squadquest-supabase/Job/squadquest-supabase-test-analytics.yaml
index 6749a02..e810a1a 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-analytics.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-analytics.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-analytics:4000/health
+                http://squadquest-supabase-supabase-analytics:4000/health \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-analytics."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-analytics is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-auth.yaml b/squadquest-supabase/Job/squadquest-supabase-test-auth.yaml
index e88aa97..e0d602d 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-auth.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-auth.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-auth:9999/health
+                http://squadquest-supabase-supabase-auth:9999/health \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-auth."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-auth is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-db.yaml b/squadquest-supabase/Job/squadquest-supabase-test-db.yaml
index 896c90a..4cd4090 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-db.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-db.yaml
@@ -17,9 +17,9 @@ spec:
         - command:
             - /bin/sh
             - '-c'
-            - >
-              pg_isready -h $(DB_HOST) -p $(DB_PORT) -U $(DB_USER) || $(echo
-              "\e[0;31mFailed to connect to the database." && exit 1)
+            - |
+              pg_isready -h $(DB_HOST) -p $(DB_PORT) -U $(DB_USER) \
+                || { echo -e "\033[31mFailed to connect to the database."; exit 1; }
 
               echo "Database is ready"
           env:
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-imgproxy.yaml b/squadquest-supabase/Job/squadquest-supabase-test-imgproxy.yaml
index 24175eb..3e8cc9b 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-imgproxy.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-imgproxy.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-imgproxy:5001/health
+                http://squadquest-supabase-supabase-imgproxy:5001/health \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-imgproxy."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-imgproxy is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-kong.yaml b/squadquest-supabase/Job/squadquest-supabase-test-kong.yaml
index e199b44..d77b125 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-kong.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-kong.yaml
@@ -22,7 +22,8 @@ spec:
               curl -sL --fail \
                 -o /dev/null \
                 "http://${DASHBOARD_USERNAME}:${DASHBOARD_PASSWORD}@squadquest-supabase-supabase-kong:8000" \
-                || ( echo -e "\e[0;31mFailed to get a valid response." && exit 1 )
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-kong."; exit 1; }
+
               echo "Successfully connected."
           env:
             - name: DASHBOARD_USERNAME
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-meta.yaml b/squadquest-supabase/Job/squadquest-supabase-test-meta.yaml
index d6da7dd..fa64be3 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-meta.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-meta.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-meta:8080/health
+                http://squadquest-supabase-supabase-meta:8080/health \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-meta."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-meta is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-realtime.yaml b/squadquest-supabase/Job/squadquest-supabase-test-realtime.yaml
index 521d3f6..146d396 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-realtime.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-realtime.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-realtime:4000
+                http://squadquest-supabase-supabase-realtime:4000 \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-realtime."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-realtime is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-rest.yaml b/squadquest-supabase/Job/squadquest-supabase-test-rest.yaml
index eb16c61..46eb5b7 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-rest.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-rest.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-rest:3000
+                http://squadquest-supabase-supabase-rest:3000 \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-rest."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-rest is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-storage.yaml b/squadquest-supabase/Job/squadquest-supabase-test-storage.yaml
index 9149fe1..14421b0 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-storage.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-storage.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-storage:5000/status
+                http://squadquest-supabase-supabase-storage:5000/status \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-storage."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-storage is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent
diff --git a/squadquest-supabase/Job/squadquest-supabase-test-studio.yaml b/squadquest-supabase/Job/squadquest-supabase-test-studio.yaml
index a418623..e9cf824 100644
--- a/squadquest-supabase/Job/squadquest-supabase-test-studio.yaml
+++ b/squadquest-supabase/Job/squadquest-supabase-test-studio.yaml
@@ -19,7 +19,9 @@ spec:
             - '-c'
             - |
               curl -sfo /dev/null \
-                http://squadquest-supabase-supabase-studio:3000/api/profile
+                http://squadquest-supabase-supabase-studio:3000/api/profile \
+                  || { echo -e "\033[31mFailed to connect to the squadquest-supabase-supabase-studio."; exit 1; }
+
               echo "Sevice squadquest-supabase-supabase-studio is healthy."
           image: kdevup/curljq
           imagePullPolicy: IfNotPresent