diff --git a/pom.xml b/pom.xml
index 8a0a68ab6a06673474bc17449ad6fd350d96775a..6985a11e308d08fd7e9a012e9bbc403e14ca4b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,11 @@
             <artifactId>kypo2-security-commons</artifactId>
             <version>1.0.40</version>
         </dependency>
+        <dependency>
+            <groupId>cz.muni.ics.kypo</groupId>
+            <artifactId>kypo-elasticsearch-documents</artifactId>
+            <version>1.0.16</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
new file mode 100644
index 0000000000000000000000000000000000000000..0da28da4d11878f9cad3510908b09744b69ddb91
--- /dev/null
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
@@ -0,0 +1,30 @@
+package cz.muni.csirt.kypo.elasticsearch.service.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * The type Object mapper config elasticsearch.
+ */
+@Configuration
+public class ObjectMapperConfigElasticsearch {
+
+    /**
+     * Object mapper object mapper.
+     *
+     * @return the object mapper
+     */
+    @Bean("objMapperForElasticsearch")
+    public ObjectMapper objectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        return objectMapper;
+    }
+
+}