diff --git a/crates/contextforge-data-plane-lib/src/lib.rs b/crates/contextforge-data-plane-lib/src/lib.rs
index b18e2496..a36fcd59 100644
--- a/crates/contextforge-data-plane-lib/src/lib.rs
+++ b/crates/contextforge-data-plane-lib/src/lib.rs
@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use axum::middleware;
+use axum::{body::Body, middleware, response::Response, routing::get};
 use axum_otel_metrics::HttpMetricsLayerBuilder;
 use contextforge_data_plane_cpex::GatewayPluginRuntimeHandle;
 use futures::FutureExt;
-use http::uri::Authority;
+use http::{StatusCode, header, uri::Authority};
 
 use rmcp::transport::{
     StreamableHttpServerConfig,
@@ -167,6 +167,7 @@ impl Gateway {
 
         #[cfg(feature = "with_tools")]
         let app = tools::add_tools(app);
+        let app = app.route("/health", get(health));
 
         let app = app.with_state(mcp_gateway_state);
         let app = axum::Router::new()
@@ -184,6 +185,14 @@ pub async fn get_config_store(config: &Config) -> Result<RedisUserConfigStore> {
     RedisUserConfigStore::new(&RedisClient::try_from(redis_config)?, cache_expiry).await
 }
 
+async fn health() -> Response {
+    Response::builder()
+        .status(StatusCode::OK)
+        .header(header::CONTENT_TYPE, "application/json")
+        .body(Body::from("{\"status\": \"healthy\"}"))
+        .expect("Expecting this to work")
+}
+
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;
diff --git a/crates/contextforge-data-plane-lib/src/tools.rs b/crates/contextforge-data-plane-lib/src/tools.rs
index b95f6342..111aeea9 100644
--- a/crates/contextforge-data-plane-lib/src/tools.rs
+++ b/crates/contextforge-data-plane-lib/src/tools.rs
@@ -52,15 +52,6 @@ pub fn add_tools(router: Router<ContextForgeDataPlaneAppState>) -> Router<Contex
         .route(TOKEN_PATH, post(get_custom_token))
         .route(JWKS_PATH, get(get_jwks))
         .route(CONFIGURE_USER_PATH, post(configure_user))
-        .route("/health", get(health))
-}
-
-pub async fn health() -> Response {
-    Response::builder()
-        .status(StatusCode::OK)
-        .header(header::CONTENT_TYPE, "application/json")
-        .body(Body::from("{\"status\": \"healthy\"}"))
-        .expect("Expecting this to work")
 }
 
 pub async fn get_custom_token(