diff --git a/TODO.md b/TODO.md
index e8718ca..1764193 100644
--- a/TODO.md
+++ b/TODO.md
@@ -22,7 +22,7 @@ Date : 23-24 nov 2021
 
 - [x] 5. The application can run with an embedded in-memory database
 
-- [ ] 6. The application will have a health check endpoint
+- [x] 6. The application will have a health check endpoint
 
 - [ ] 7. The application will have suitable functional tests, checking real http functionality
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 26dc995..a26a27a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -18,4 +18,9 @@ spring.h2.console.enabled=true
 # Custom H2 Console URL (optional)
 spring.h2.console.path=/h2
 # Avoid hibernate initialization
-spring.jpa.hibernate.ddl-auto=none
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto=none
+
+# Actuator detailed health check available at /health
+management.endpoints.web.base-path=/
+management.endpoint.health.show-details=always
+management.endpoint.health.enabled=true
\ No newline at end of file