diff --git a/cmak/Dockerfile b/cmak/Dockerfile
index 2592e67..a59c737 100644
--- a/cmak/Dockerfile
+++ b/cmak/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 FROM debian:buster
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 ENV SCALA_VERSION 2.12.10
 ENV SBT_VERSION 1.3.8
@@ -35,5 +35,3 @@ EXPOSE 9000
 
 ENTRYPOINT ["bin/cmak"]
 CMD ["-Dconfig.file=conf/application.conf", "-Dhttp.port=9000", "-Dpidfile.path=/dev/null"]
-
-HEALTHCHECK CMD curl -f http://127.0.0.1:9000/api/health || exit 1
diff --git a/cmak/docker-compose.yml b/cmak/docker-compose.yml
index 474d030..76e3485 100644
--- a/cmak/docker-compose.yml
+++ b/cmak/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
@@ -37,4 +37,6 @@ services:
       - KAFKA_MANAGER_PASSWORD=admin
     depends_on:
       - zookeeper
+    healthcheck:
+      test: curl -f http://127.0.0.1:9000/api/health || exit 1
     restart: unless-stopped