diff --git a/pgpainless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java b/pgpainless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java
index c5505156..bfbc0024 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/symmetric_encryption/SymmetricEncryptorDecryptor.java
@@ -42,6 +42,7 @@ import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.bouncycastle.util.io.Streams;
 import org.pgpainless.algorithm.CompressionAlgorithm;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
+import org.pgpainless.provider.ProviderFactory;
 import org.pgpainless.util.Passphrase;
 
 /**
@@ -77,9 +78,9 @@ public class SymmetricEncryptorDecryptor {
                 new JcePGPDataEncryptorBuilder(encryptionAlgorithm.getAlgorithmId())
                         .setWithIntegrityPacket(true)
                         .setSecureRandom(new SecureRandom())
-                        .setProvider("BC"));
+                        .setProvider(ProviderFactory.getProvider()));
 
-        encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(password.getChars()).setProvider("BC"));
+        encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(password.getChars()).setProvider(ProviderFactory.getProvider()));
 
         OutputStream encOut = encGen.open(bOut, compressedData.length);
 
diff --git a/pgpainless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java b/pgpainless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java
index 5ab27e45..18782cb2 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/AbstractPGPainlessTest.java
@@ -17,13 +17,13 @@ package org.pgpainless;
 
 import java.security.Security;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.BeforeClass;
+import org.pgpainless.provider.ProviderFactory;
 
 public abstract class AbstractPGPainlessTest {
 
     @BeforeClass
     public static void registerProvider() {
-        Security.insertProviderAt(new BouncyCastleProvider(), 1);
+        Security.insertProviderAt(ProviderFactory.getProvider(), 1);
     }
 }