diff --git a/portainer_agent/CHANGELOG.md b/portainer_agent/CHANGELOG.md
index 108d8df64..67334e25c 100644
--- a/portainer_agent/CHANGELOG.md
+++ b/portainer_agent/CHANGELOG.md
@@ -1 +1,2 @@
+- Correct healthcheck
 - First build
diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index 4472d26cb..3f1f3581a 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -75,6 +75,8 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # 4 Entrypoint #
 ################
 
+RUN chmod a+x /usr/sbin/healthcheck && \
+    chmod a+x /usr/sbin/wait-for-signal
 WORKDIR "/app"
 ENTRYPOINT [ "/init" ]
 
@@ -112,11 +114,11 @@ LABEL \
 # 6 Healthcheck #
 #################
 
-ENV HEALTH_PORT="9000" \
-    HEALTH_URL="/api/system/status"
+ENV HEALTH_PORT="" \
+    HEALTH_URL=""
 HEALTHCHECK \
     --interval=5s \
     --retries=5 \
     --start-period=30s \
     --timeout=25s \
-    CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
+    CMD healthcheck &>/dev/null || exit 1
diff --git a/portainer_agent/config.json b/portainer_agent/config.json
index b0f7013ed..799b5fc50 100644
--- a/portainer_agent/config.json
+++ b/portainer_agent/config.json
@@ -47,5 +47,5 @@
   },
   "slug": "portainer_agent",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "2.18.2-3"
-}
+  "version": "2.18.2-5"
+}
\ No newline at end of file