diff --git a/Dockerfile b/Dockerfile
index 6234528539425ffb0cd6bfcd0af1a4db93868b81..ec56922e9d391a6b00015709faf102c0e7c1db97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,6 +163,4 @@ RUN wget https://www.mongodb.org/static/pgp/server-4.4.asc -O /tmp/mongo.asc &&
 LABEL com.github.containers.toolbox="true" \
       com.github.debarshiray.toolbox="true"
 VOLUME /run/sshd
-EXPOSE 2222
 CMD ["/bin/bash"]
-HEALTHCHECK CMD nc -vzw3 localhost 2222 || exit 1
diff --git a/docker-compose.yml b/docker-compose.yml
index e595e49f962f824360e61a43d93806943a5a2d90..1107e1bb4719b12feec705930e8fc597cd0b24ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,10 @@ services:
     build:
       context: .
     command: ["/usr/sbin/sshd", "-D", "-o", "Port=2222"]
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - nc -vzw3 localhost 2222 || exit 1
     hostname: workbench.shore.co.il
     image: registry.shore.co.il/workbench:${TAG:-latest}
     network_mode: host