diff --git a/helm/nshm/templates/account/deployment.yaml b/helm/nshm/templates/account/deployment.yaml
index 70ad577b..085ffff5 100644
--- a/helm/nshm/templates/account/deployment.yaml
+++ b/helm/nshm/templates/account/deployment.yaml
@@ -28,7 +28,7 @@ spec:
               name: account-secret
         livenessProbe:
           httpGet:
-            path: /healthz
+            path: /actuator/health/liveness
             port: 8081
           initialDelaySeconds: 30
           periodSeconds: 30
@@ -36,7 +36,7 @@ spec:
 
         readinessProbe:
           httpGet:
-            path: /ready
+            path: /actuator/health/readiness
             port: 8081
           initialDelaySeconds: 30
           periodSeconds: 30
diff --git a/helm/nshm/templates/wishlist/deployment.yaml b/helm/nshm/templates/wishlist/deployment.yaml
index b8a2083b..0d85c0d0 100644
--- a/helm/nshm/templates/wishlist/deployment.yaml
+++ b/helm/nshm/templates/wishlist/deployment.yaml
@@ -28,7 +28,7 @@ spec:
               name: wishlist-secret
         livenessProbe:
           httpGet:
-            path: /healthz
+            path: /actuator/health/liveness
             port: 8083
           initialDelaySeconds: 30
           periodSeconds: 30
@@ -36,7 +36,7 @@ spec:
 
         readinessProbe:
           httpGet:
-            path: /ready
+            path: /actuator/health/readiness
             port: 8083
           initialDelaySeconds: 30
           periodSeconds: 30
diff --git a/helm/rabbitmq-cluster-operator/values.yaml b/helm/rabbitmq-cluster-operator/values.yaml
index 61e4e14e..1e7752b0 100644
--- a/helm/rabbitmq-cluster-operator/values.yaml
+++ b/helm/rabbitmq-cluster-operator/values.yaml
@@ -1,3 +1,8 @@
+persistence:
+  enabled: true
+  storageClassName: "gp2"  # This should match the StorageClass created in step 1
+  accessMode: ReadWriteOnce
+  size: 8Gi  # Size of the Persistent Volume
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
diff --git a/locust/locust-master-deployment.yaml b/locust/locust-master-deployment.yaml
index ef951181..fef27f03 100644
--- a/locust/locust-master-deployment.yaml
+++ b/locust/locust-master-deployment.yaml
@@ -23,6 +23,7 @@ spec:
             - "--host=http://www.nshm.store"
           ports:
             - containerPort: 8089
+            - containerPort: 5557
           volumeMounts:
             - name: locust
               mountPath: /mnt/locust
@@ -41,6 +42,11 @@ spec:
   selector:
     app: locust-master
   ports:
-    - protocol: TCP
+    - name: web-ui
+      protocol: TCP
       port: 8089
       targetPort: 8089
+    - name: master-port
+      protocol: TCP
+      port: 5557
+      targetPort: 5557
diff --git a/services/account/src/main/java/edu/nus/market/controller/HealthController.java b/services/account/src/main/java/edu/nus/market/controller/HealthController.java
deleted file mode 100644
index d8019c03..00000000
--- a/services/account/src/main/java/edu/nus/market/controller/HealthController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package edu.nus.market.controller;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class HealthController {
-    @GetMapping("/healthz")
-    public ResponseEntity<String> livenessCheck() {
-        return ResponseEntity.ok("Liveness check OK");
-    }
-
-    @GetMapping("/ready")
-    public ResponseEntity<String> readinessCheck() {
-        return ResponseEntity.ok("Readiness check OK");
-    }
-}
diff --git a/services/account/src/main/resources/application.yml b/services/account/src/main/resources/application.yml
index 2765ce6e..d65ec37d 100644
--- a/services/account/src/main/resources/application.yml
+++ b/services/account/src/main/resources/application.yml
@@ -28,3 +28,17 @@ logging:
   level:
     org.springframework.jdbc.core: DEBUG
     org.hibernate.SQL: DEBUG
+
+
+management:
+  health:
+    probes:
+      enabled: true
+    group:
+      liveness:
+        include: livenessState
+      readiness:
+        include: readinessState
+  endpoint:
+    health:
+      show-details: always
diff --git a/services/wishlist/src/main/java/edu/nus/market/controller/HealthController.java b/services/wishlist/src/main/java/edu/nus/market/controller/HealthController.java
deleted file mode 100644
index d8019c03..00000000
--- a/services/wishlist/src/main/java/edu/nus/market/controller/HealthController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package edu.nus.market.controller;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class HealthController {
-    @GetMapping("/healthz")
-    public ResponseEntity<String> livenessCheck() {
-        return ResponseEntity.ok("Liveness check OK");
-    }
-
-    @GetMapping("/ready")
-    public ResponseEntity<String> readinessCheck() {
-        return ResponseEntity.ok("Readiness check OK");
-    }
-}