diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java
index fef4cb165..15f1b95c6 100644
--- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java
+++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/utils/ProviderUtils.java
@@ -1,5 +1,6 @@
 package de.adorsys.datasafe.encrypiton.impl.utils;
 
+import de.adorsys.keymanagement.adapter.modules.generator.GeneratorModule_ProviderFactory;
 import lombok.experimental.UtilityClass;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -9,5 +10,5 @@
 @UtilityClass
 public class ProviderUtils {
 
-    public static final Provider bcProvider = Security.getProvider(BouncyCastleProvider.PROVIDER_NAME);
+    public static final Provider bcProvider = GeneratorModule_ProviderFactory.provider();
 }
diff --git a/datasafe-encryption/pom.xml b/datasafe-encryption/pom.xml
index b7ac67034..7386f31c6 100644
--- a/datasafe-encryption/pom.xml
+++ b/datasafe-encryption/pom.xml
@@ -15,4 +15,11 @@
         <module>datasafe-encryption-api</module>
         <module>datasafe-encryption-impl</module>
     </modules>
+    <dependencies>
+        <dependency>
+            <groupId>de.adorsys.keymanagement</groupId>
+            <artifactId>bouncycastle-adapter</artifactId>
+            <version>0.0.11</version>
+        </dependency>
+    </dependencies>
 </project>