diff --git a/quickwit/quickwit-integration-tests/src/test_utils/cluster_sandbox.rs b/quickwit/quickwit-integration-tests/src/test_utils/cluster_sandbox.rs
index a13aa68f72d..79cddefa661 100644
--- a/quickwit/quickwit-integration-tests/src/test_utils/cluster_sandbox.rs
+++ b/quickwit/quickwit-integration-tests/src/test_utils/cluster_sandbox.rs
@@ -223,14 +223,17 @@ impl ClusterSandbox {
         Self::start_cluster_with_configs(temp_dir, node_configs).await
     }
 
-    pub async fn start_standalone_with_otlp_service() -> anyhow::Result<Self> {
+    pub async fn start_cluster_with_otlp_service(
+        nodes_services: &[HashSet<QuickwitService>],
+    ) -> anyhow::Result<Self> {
         let temp_dir = tempfile::tempdir()?;
-        let services = QuickwitService::supported_services();
-        let mut node_configs = build_node_configs(temp_dir.path().to_path_buf(), &[services]);
-        node_configs[0]
-            .node_config
-            .indexer_config
-            .enable_otlp_endpoint = true;
+        let mut node_configs = build_node_configs(temp_dir.path().to_path_buf(), nodes_services);
+        // Set OTLP endpoint for indexers.
+        for node_config in node_configs.iter_mut() {
+            if node_config.services.contains(&QuickwitService::Indexer) {
+                node_config.node_config.indexer_config.enable_otlp_endpoint = true;
+            }
+        }
         Self::start_cluster_with_configs(temp_dir, node_configs).await
     }
 
diff --git a/quickwit/quickwit-integration-tests/src/tests/index_tests.rs b/quickwit/quickwit-integration-tests/src/tests/index_tests.rs
index f038b62d32a..abf0eba87ae 100644
--- a/quickwit/quickwit-integration-tests/src/tests/index_tests.rs
+++ b/quickwit/quickwit-integration-tests/src/tests/index_tests.rs
@@ -610,7 +610,14 @@ async fn test_shutdown() {
 #[tokio::test]
 async fn test_ingest_traces_with_otlp_grpc_api() {
     quickwit_common::setup_logging_for_tests();
-    let sandbox = ClusterSandbox::start_standalone_with_otlp_service()
+    let nodes_services = vec![
+        HashSet::from_iter([QuickwitService::Searcher]),
+        HashSet::from_iter([QuickwitService::Metastore]),
+        HashSet::from_iter([QuickwitService::Indexer]),
+        HashSet::from_iter([QuickwitService::ControlPlane]),
+        HashSet::from_iter([QuickwitService::Janitor]),
+    ];
+    let sandbox = ClusterSandbox::start_cluster_with_otlp_service(&nodes_services)
         .await
         .unwrap();
     // Wait fo the pipelines to start (one for logs and one for traces)
diff --git a/quickwit/quickwit-serve/src/grpc.rs b/quickwit/quickwit-serve/src/grpc.rs
index 9e65e911c94..4b3b2629ebe 100644
--- a/quickwit/quickwit-serve/src/grpc.rs
+++ b/quickwit/quickwit-serve/src/grpc.rs
@@ -120,6 +120,7 @@ pub(crate) async fn start_grpc_server(
         };
     let otlp_log_grpc_service =
         if let Some(otlp_logs_service) = services.otlp_logs_service_opt.clone() {
+            enabled_grpc_services.insert("otlp-log");
             let logs_service = LogsServiceServer::new(otlp_logs_service)
                 .accept_compressed(CompressionEncoding::Gzip);
             Some(logs_service)
diff --git a/quickwit/quickwit-serve/src/lib.rs b/quickwit/quickwit-serve/src/lib.rs
index fa76b502ce7..eab29b5db7f 100644
--- a/quickwit/quickwit-serve/src/lib.rs
+++ b/quickwit/quickwit-serve/src/lib.rs
@@ -501,7 +501,7 @@ pub async fn serve_quickwit(
         None
     };
 
-    let otlp_logs_service_opt = if node_config.is_service_enabled(QuickwitService::Searcher)
+    let otlp_logs_service_opt = if node_config.is_service_enabled(QuickwitService::Indexer)
         && node_config.indexer_config.enable_otlp_endpoint
     {
         Some(OtlpGrpcLogsService::new(ingest_service.clone()))
@@ -509,7 +509,7 @@ pub async fn serve_quickwit(
         None
     };
 
-    let otlp_traces_service_opt = if node_config.is_service_enabled(QuickwitService::Searcher)
+    let otlp_traces_service_opt = if node_config.is_service_enabled(QuickwitService::Indexer)
         && node_config.indexer_config.enable_otlp_endpoint
     {
         Some(OtlpGrpcTracesService::new(ingest_service.clone(), None))