diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md
index be48c8923..c629b6790 100644
--- a/fireflyiii/CHANGELOG.md
+++ b/fireflyiii/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Implemented healthcheck
 
 ## 6.0.0 (04-03-2023)
 - MAJOR CHANGE, BACKUP DATABASE AND ADDON BEFORE UPDATING
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 3220b1e90..bedacac3b 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -110,3 +110,16 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
+
+#################
+# 6 Healthcheck #
+#################
+
+ARG WEBUI_PORT="8080"
+ARG URL="/health"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1
diff --git a/fireflyiii_data_importer/CHANGELOG.md b/fireflyiii_data_importer/CHANGELOG.md
index a3d8c5ef3..e4b656a6f 100644
--- a/fireflyiii_data_importer/CHANGELOG.md
+++ b/fireflyiii_data_importer/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Implemented healthcheck
 
 ## version-v1.0.2 (28-01-2023)
 - Update to latest version from fireflyiii/data-importer
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 597a8e7a3..9252a2552 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -106,3 +106,16 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
+
+#################
+# 6 Healthcheck #
+#################
+
+ARG WEBUI_PORT="8080"
+ARG URL="/health"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1
diff --git a/fireflyiii_fints_importer/CHANGELOG.md b/fireflyiii_fints_importer/CHANGELOG.md
index 8b03e8e08..2dfa05028 100644
--- a/fireflyiii_fints_importer/CHANGELOG.md
+++ b/fireflyiii_fints_importer/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Implemented healthcheck
 - WARNING : update to supervisor 2022.11 before installing
 - Add codenotary sign
 - Initial release
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index 3c2c19a47..f43022fa9 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -100,3 +100,16 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
+
+#################
+# 6 Healthcheck #
+#################
+
+ARG WEBUI_PORT="8080"
+ARG URL="/health"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1