diff --git a/pom.xml b/pom.xml
index 26a484e..a62dca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,11 +36,6 @@
             <groupId>dev.vality</groupId>
             <artifactId>shared-resources</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.rbkmoney</groupId>
-            <artifactId>eventstock-client-damsel</artifactId>
-            <version>1.2.12</version>
-        </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>kafka-common-lib</artifactId>
@@ -58,6 +53,14 @@
             <groupId>dev.vality.geck</groupId>
             <artifactId>serializer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>dev.vality.geck</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>dev.vality.geck</groupId>
+            <artifactId>filter</artifactId>
+        </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>deanonimus-proto</artifactId>
diff --git a/src/main/java/dev/vality/deanonimus/converter/ContractConverter.java b/src/main/java/dev/vality/deanonimus/converter/ContractConverter.java
index f2bd548..5aa817f 100644
--- a/src/main/java/dev/vality/deanonimus/converter/ContractConverter.java
+++ b/src/main/java/dev/vality/deanonimus/converter/ContractConverter.java
@@ -1,7 +1,7 @@
 package dev.vality.deanonimus.converter;
 
 import dev.vality.damsel.deanonimus.*;
-import com.rbkmoney.geck.common.util.TypeUtil;
+import dev.vality.geck.common.util.TypeUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;
diff --git a/src/main/java/dev/vality/deanonimus/endpoint/DeanonimusServlet.java b/src/main/java/dev/vality/deanonimus/endpoint/DeanonimusServlet.java
index 74e89bd..8fdde0f 100644
--- a/src/main/java/dev/vality/deanonimus/endpoint/DeanonimusServlet.java
+++ b/src/main/java/dev/vality/deanonimus/endpoint/DeanonimusServlet.java
@@ -1,7 +1,7 @@
 package dev.vality.deanonimus.endpoint;
 
 import dev.vality.damsel.deanonimus.DeanonimusSrv;
-import com.rbkmoney.woody.thrift.impl.http.THServiceBuilder;
+import dev.vality.woody.thrift.impl.http.THServiceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.*;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/AbstractClaimChangedHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/AbstractClaimChangedHandler.java
index 27f86be..e765c77 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/AbstractClaimChangedHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/AbstractClaimChangedHandler.java
@@ -2,10 +2,10 @@ package dev.vality.deanonimus.kafka.handler.party.management;
 
 import dev.vality.damsel.payment_processing.ClaimStatus;
 import dev.vality.damsel.payment_processing.PartyChange;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 
 public abstract class AbstractClaimChangedHandler implements PartyManagementHandler {
 
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/Handler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/Handler.java
index 9cf8d15..cda7cf4 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/Handler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/Handler.java
@@ -1,7 +1,7 @@
 package dev.vality.deanonimus.kafka.handler.party.management;
 
 
-import com.rbkmoney.geck.filter.Filter;
+import dev.vality.geck.filter.Filter;
 import org.apache.commons.lang3.NotImplementedException;
 
 public interface Handler<T, E> {
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/contract/ContractCreatedHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/contract/ContractCreatedHandler.java
index 6ca5f85..8edf355 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/contract/ContractCreatedHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/contract/ContractCreatedHandler.java
@@ -10,8 +10,8 @@ import dev.vality.deanonimus.domain.ContractStatus;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.kafka.handler.party.management.AbstractClaimChangedHandler;
 import dev.vality.deanonimus.util.ContractUtil;
-import com.rbkmoney.geck.common.util.TBaseUtil;
-import com.rbkmoney.geck.common.util.TypeUtil;
+import dev.vality.geck.common.util.TBaseUtil;
+import dev.vality.geck.common.util.TypeUtil;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyBlockingHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyBlockingHandler.java
index a5ea821..bda7975 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyBlockingHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyBlockingHandler.java
@@ -6,10 +6,10 @@ import dev.vality.deanonimus.db.PartyRepository;
 import dev.vality.deanonimus.db.exception.PartyNotFoundException;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.kafka.handler.party.management.PartyManagementHandler;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyCreatedHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyCreatedHandler.java
index 3642af0..050091d 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyCreatedHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartyCreatedHandler.java
@@ -7,10 +7,10 @@ import dev.vality.deanonimus.domain.Blocking;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.domain.Suspension;
 import dev.vality.deanonimus.kafka.handler.party.management.PartyManagementHandler;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartySuspensionHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartySuspensionHandler.java
index 3de335f..e34d5b6 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartySuspensionHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/party/PartySuspensionHandler.java
@@ -6,10 +6,10 @@ import dev.vality.deanonimus.db.PartyRepository;
 import dev.vality.deanonimus.db.exception.PartyNotFoundException;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.kafka.handler.party.management.PartyManagementHandler;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopBlockingHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopBlockingHandler.java
index 051d2fd..3b9e624 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopBlockingHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopBlockingHandler.java
@@ -8,10 +8,10 @@ import dev.vality.deanonimus.db.exception.ShopNotFoundException;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.domain.Shop;
 import dev.vality.deanonimus.kafka.handler.party.management.PartyManagementHandler;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopSuspensionHandler.java b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopSuspensionHandler.java
index 9e80dda..f71c860 100644
--- a/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopSuspensionHandler.java
+++ b/src/main/java/dev/vality/deanonimus/kafka/handler/party/management/shop/ShopSuspensionHandler.java
@@ -8,10 +8,10 @@ import dev.vality.deanonimus.db.exception.ShopNotFoundException;
 import dev.vality.deanonimus.domain.Party;
 import dev.vality.deanonimus.domain.Shop;
 import dev.vality.deanonimus.kafka.handler.party.management.PartyManagementHandler;
-import com.rbkmoney.geck.filter.Filter;
-import com.rbkmoney.geck.filter.PathConditionFilter;
-import com.rbkmoney.geck.filter.condition.IsNullCondition;
-import com.rbkmoney.geck.filter.rule.PathConditionRule;
+import dev.vality.geck.filter.Filter;
+import dev.vality.geck.filter.PathConditionFilter;
+import dev.vality.geck.filter.condition.IsNullCondition;
+import dev.vality.geck.filter.rule.PathConditionRule;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/dev/vality/deanonimus/util/ContractUtil.java b/src/main/java/dev/vality/deanonimus/util/ContractUtil.java
index c20229a..cf94cc7 100644
--- a/src/main/java/dev/vality/deanonimus/util/ContractUtil.java
+++ b/src/main/java/dev/vality/deanonimus/util/ContractUtil.java
@@ -5,7 +5,7 @@ import dev.vality.damsel.domain.LegalAgreement;
 import dev.vality.damsel.domain.ServiceAcceptanceActPreferences;
 import dev.vality.deanonimus.domain.Contract;
 import dev.vality.deanonimus.domain.RepresentativeDocument;
-import com.rbkmoney.geck.common.util.TypeUtil;
+import dev.vality.geck.common.util.TypeUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/dev/vality/deanonimus/util/ContractorUtil.java b/src/main/java/dev/vality/deanonimus/util/ContractorUtil.java
index fa6cd2b..ac1be69 100644
--- a/src/main/java/dev/vality/deanonimus/util/ContractorUtil.java
+++ b/src/main/java/dev/vality/deanonimus/util/ContractorUtil.java
@@ -6,7 +6,7 @@ import dev.vality.damsel.domain.RussianLegalEntity;
 import dev.vality.deanonimus.domain.Contractor;
 import dev.vality.deanonimus.domain.ContractorType;
 import dev.vality.deanonimus.domain.LegalEntity;
-import com.rbkmoney.geck.common.util.TBaseUtil;
+import dev.vality.geck.common.util.TBaseUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5bb554e..2569d11 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
 
 management:
   security:
-    enabled: false
+    flag: false
   server:
     port: '@management.port@'
   metrics:
@@ -29,8 +29,8 @@ spring:
     ansi:
       enabled: always
   elasticsearch:
-    rest:
-      uris: "http://localhost:9200"
+    uris: "http://localhost:9200"
+
 info:
   version: '@project.version@'
   stage: dev
diff --git a/src/test/java/dev/vality/deanonimus/PartyFlowGenerator.java b/src/test/java/dev/vality/deanonimus/PartyFlowGenerator.java
index 0a727fe..e634f83 100644
--- a/src/test/java/dev/vality/deanonimus/PartyFlowGenerator.java
+++ b/src/test/java/dev/vality/deanonimus/PartyFlowGenerator.java
@@ -2,10 +2,10 @@ package dev.vality.deanonimus;
 
 import dev.vality.damsel.domain.*;
 import dev.vality.damsel.payment_processing.*;
-import com.rbkmoney.geck.common.util.TypeUtil;
-import com.rbkmoney.geck.serializer.kit.mock.MockMode;
-import com.rbkmoney.geck.serializer.kit.mock.MockTBaseProcessor;
-import com.rbkmoney.geck.serializer.kit.tbase.TBaseHandler;
+import dev.vality.geck.common.util.TypeUtil;
+import dev.vality.geck.serializer.kit.mock.MockMode;
+import dev.vality.geck.serializer.kit.mock.MockTBaseProcessor;
+import dev.vality.geck.serializer.kit.tbase.TBaseHandler;
 import dev.vality.machinegun.eventsink.MachineEvent;
 import dev.vality.machinegun.eventsink.SinkEvent;
 import dev.vality.machinegun.msgpack.Value;
diff --git a/src/test/java/dev/vality/deanonimus/TestData.java b/src/test/java/dev/vality/deanonimus/TestData.java
index dc29a2c..4f70714 100644
--- a/src/test/java/dev/vality/deanonimus/TestData.java
+++ b/src/test/java/dev/vality/deanonimus/TestData.java
@@ -4,9 +4,9 @@ import dev.vality.deanonimus.domain.ContractStatus;
 import dev.vality.deanonimus.domain.ContractorType;
 import dev.vality.deanonimus.domain.LegalEntity;
 import dev.vality.deanonimus.domain.Suspension;
-import com.rbkmoney.geck.serializer.kit.mock.FieldHandler;
-import com.rbkmoney.geck.serializer.kit.mock.MockMode;
-import com.rbkmoney.geck.serializer.kit.mock.MockTBaseProcessor;
+import dev.vality.geck.serializer.kit.mock.FieldHandler;
+import dev.vality.geck.serializer.kit.mock.MockMode;
+import dev.vality.geck.serializer.kit.mock.MockTBaseProcessor;
 
 import java.time.Instant;
 import java.util.Map;
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index e1f57ed..82148a3 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -6,5 +6,5 @@
     <root level="warn">
         <appender-ref ref="CONSOLE"/>
     </root>
-    <logger name="com.rbkmoney.woody" level="ALL"/>
+    <logger name="dev.vality.woody" level="ALL"/>
 </configuration>