diff --git a/docker-compose.yml b/docker-compose.yml
index 9700a02c4bf..09bfee7a759 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -682,12 +682,7 @@ services:
       - sentry-vroom:/var/vroom/sentry-profiles
     healthcheck:
       <<: *healthcheck_defaults
-      test:
-        - "CMD"
-        - "/bin/bash"
-        - "-c"
-        # Courtesy of https://unix.stackexchange.com/a/234089/108960
-        - 'exec 3<>/dev/tcp/127.0.0.1/8085 && echo -e "GET /health HTTP/1.1\r\nhost: 127.0.0.1\r\n\r\n" >&3 && grep OK -s -m 1 <&3'
+      test: ["CMD", "/bin/vroom", "healthcheck"]
     depends_on:
       kafka:
         <<: *depends_on-healthy
diff --git a/optional-modifications/patches/external-kafka/docker-compose.yml.patch b/optional-modifications/patches/external-kafka/docker-compose.yml.patch
index 0f2838f51a3..ddbc1b8c2b9 100644
--- a/optional-modifications/patches/external-kafka/docker-compose.yml.patch
+++ b/optional-modifications/patches/external-kafka/docker-compose.yml.patch
@@ -136,7 +136,7 @@
    taskscheduler:
      <<: *sentry_defaults
      command: run taskworker-scheduler
-@@ -826,14 +804,23 @@
+@@ -826,20 +804,26 @@
      <<: [*restart_policy, *pull_policy]
      image: "$VROOM_IMAGE"
      environment:
@@ -161,11 +161,7 @@
 +      - ./certificates/kafka:/kafka-certificates:ro
      healthcheck:
        <<: *healthcheck_defaults
-       test:
-@@ -842,9 +829,6 @@
-         - "-c"
-         # Courtesy of https://unix.stackexchange.com/a/234089/108960
-         - 'exec 3<>/dev/tcp/127.0.0.1/8085 && echo -e "GET /health HTTP/1.1\r\nhost: 127.0.0.1\r\n\r\n" >&3 && grep OK -s -m 1 <&3'
+       test: ["CMD", "/bin/vroom", "healthcheck"]
 -    depends_on:
 -      kafka:
 -        <<: *depends_on-healthy