diff --git a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/FeatureToRecord.java b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/FeatureToRecord.java
index d610837..262f9c2 100644
--- a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/FeatureToRecord.java
+++ b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/FeatureToRecord.java
@@ -22,7 +22,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.producer.geotools")
 public class FeatureToRecord implements Function<SimpleFeature, GeodataRecord> {
 
     private Map<CoordinateReferenceSystem, String> crsToSrs = new IdentityHashMap<>();
diff --git a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoJsonFormat.java b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoJsonFormat.java
index cd54728..73de456 100644
--- a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoJsonFormat.java
+++ b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoJsonFormat.java
@@ -14,7 +14,7 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.producer.geotools")
 class GeoJsonFormat extends GeoToolsFormat {
 
     private static final GeoJSONDataStoreFactory FACTORY = new GeoJSONDataStoreFactory();
diff --git a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsDataReader.java b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsDataReader.java
index a0c637c..a7c71f3 100644
--- a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsDataReader.java
+++ b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsDataReader.java
@@ -16,8 +16,8 @@
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 @ToString
+@Slf4j(topic = "com.camptocamp.opendata.producer.geotools")
 public class GeoToolsDataReader implements DatasetReader {
 
     private @Getter @Setter List<GeoToolsFormat> supportedFormats = new ArrayList<>();
diff --git a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsFormat.java b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsFormat.java
index bcb1e56..5701004 100644
--- a/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsFormat.java
+++ b/src/library/data-functions/data-functions-geotools/src/main/java/com/camptocamp/opendata/producer/geotools/GeoToolsFormat.java
@@ -43,7 +43,7 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.producer.geotools")
 abstract class GeoToolsFormat {
 
     public abstract String getName();
diff --git a/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/GeoRecordToGeoJsonFeatureModule.java b/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/GeoRecordToGeoJsonFeatureModule.java
index 4739a5a..36af223 100644
--- a/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/GeoRecordToGeoJsonFeatureModule.java
+++ b/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/GeoRecordToGeoJsonFeatureModule.java
@@ -27,7 +27,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.jackson.geojson")
 public class GeoRecordToGeoJsonFeatureModule extends SimpleModule {
     private static final long serialVersionUID = 1L;
 
diff --git a/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/JtsGeoJsonModule.java b/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/JtsGeoJsonModule.java
index 60e2e55..8763c8c 100644
--- a/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/JtsGeoJsonModule.java
+++ b/src/library/data-functions/data-functions-jackson/src/main/java/com/camptocamp/opendata/jackson/geojson/JtsGeoJsonModule.java
@@ -78,7 +78,7 @@
  * </code>
  * </pre>
  */
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.jackson.geojson")
 public class JtsGeoJsonModule extends SimpleModule {
     private static final long serialVersionUID = 1L;
 
diff --git a/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/app/IndexingApp.java b/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/app/IndexingApp.java
index e3c1107..8df6a3b 100644
--- a/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/app/IndexingApp.java
+++ b/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/app/IndexingApp.java
@@ -25,8 +25,8 @@
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
-@Slf4j
 @SpringBootApplication
+@Slf4j(topic = "com.camptocamp.opendata.indexing.app")
 public class IndexingApp {
 
     private @Autowired Producers producers;
diff --git a/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/sink/Consumers.java b/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/sink/Consumers.java
index ac7c775..e2afca1 100644
--- a/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/sink/Consumers.java
+++ b/src/services/data-indexer/src/main/java/com/camptocamp/opendata/indexing/sink/Consumers.java
@@ -8,7 +8,7 @@
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.indexing.sink")
 public class Consumers {
 
     public void index(@NonNull Flux<GeodataRecord> records) {
diff --git a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/PostgisBackendAutoConfiguration.java b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/PostgisBackendAutoConfiguration.java
index f95d87f..54db22e 100644
--- a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/PostgisBackendAutoConfiguration.java
+++ b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/PostgisBackendAutoConfiguration.java
@@ -25,13 +25,16 @@
 import com.camptocamp.opendata.producer.geotools.FeatureToRecord;
 
 import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 
 @AutoConfiguration
 @Profile("postgis")
+@Slf4j(topic = "com.camptocamp.opendata.ogc.features.autoconfigure.geotools")
 public class PostgisBackendAutoConfiguration implements WebMvcConfigurer {
 
     @Bean
     CollectionRepository postgisDataStoreCollectionRepository(DataStoreProvider dsProvider) {
+        log.info("Using GeoTools PostGIS CollectionRepository");
         return new DataStoreCollectionRepository(dsProvider, new FeatureToRecord());
     }
 
diff --git a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/SampleDataBackendAutoConfiguration.java b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/SampleDataBackendAutoConfiguration.java
index b062e85..6f64e78 100644
--- a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/SampleDataBackendAutoConfiguration.java
+++ b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/autoconfigure/geotools/SampleDataBackendAutoConfiguration.java
@@ -44,11 +44,12 @@
  */
 @AutoConfiguration
 @Profile("sample-data")
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.ogc.features.autoconfigure.geotools")
 public class SampleDataBackendAutoConfiguration {
 
     @Bean
     CollectionRepository sampleDataDataStoreCollectionRepository(SampleData dsProvider) {
+        log.info("Using geotools sample data CollectionRepository");
         return new DataStoreCollectionRepository(dsProvider, new FeatureToRecord());
     }
 
diff --git a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/repository/DataStoreCollectionRepository.java b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/repository/DataStoreCollectionRepository.java
index 1b8ccc1..790d89d 100644
--- a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/repository/DataStoreCollectionRepository.java
+++ b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/repository/DataStoreCollectionRepository.java
@@ -23,7 +23,6 @@
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.filter.text.cql2.CQL;
 import org.geotools.filter.text.cql2.CQLException;
 import org.geotools.filter.text.ecql.ECQL;
 import org.geotools.referencing.CRS;
@@ -40,7 +39,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @RequiredArgsConstructor
-@Slf4j
+@Slf4j(topic = "com.camptocamp.opendata.ogc.features.repository")
 public class DataStoreCollectionRepository implements CollectionRepository {
 
     private final @NonNull DataStoreProvider dataStoreProvider;
diff --git a/src/services/ogc-features/src/main/resources/application.yml b/src/services/ogc-features/src/main/resources/application.yml
index 5771082..147c8e9 100644
--- a/src/services/ogc-features/src/main/resources/application.yml
+++ b/src/services/ogc-features/src/main/resources/application.yml
@@ -1,6 +1,8 @@
 spring:
   application:
     name: ogc-features
+  main:
+    banner-mode: off
   jackson.default-property-inclusion: non-empty
 
 springdoc:
@@ -17,7 +19,13 @@ springdoc:
 logging:
   level:
     root: info
-    com.zaxxer.hikari.pool.HikariPool: OFF
+    com.zaxxer.hikari.pool.HikariPool: warn
+    com.zaxxer.hikari.HikariDataSource: warn
+    org.geotools.jdbc: warn
+    com.camptocamp.opendata.ogc.features.autoconfigure: info
+    com.camptocamp.opendata.ogc.features.repository: info
+    com.camptocamp.opendata.producer.geotools: info
+    com.camptocamp.opendata.jackson.geojson: info
 
 ---
 spring:
@@ -30,6 +38,6 @@ spring:
     hikari:
       maximum-pool-size: ${postgres.pool.maxsize:20}
       minimum-idle: ${postgres.pool.minsize:0}
-      max-lifetime: 1000
+      max-lifetime: 30000 # 30000ms is the minimum allowed
       
 
diff --git a/src/services/ogc-features/src/test/resources/application.yml b/src/services/ogc-features/src/test/resources/application.yml
deleted file mode 100644
index e0d2cf3..0000000
--- a/src/services/ogc-features/src/test/resources/application.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-debug: false
-logging:
-  level:
-    root: INFO
-    com.zaxxer.hikari.pool.HikariPool: OFF
-    com.zaxxer.hikari.HikariDataSource: OFF
-    # org.geotools: DEBUG