diff --git a/src/Certes/Certes.csproj b/src/Certes/Certes.csproj
index e6f9729a..e0e10832 100644
--- a/src/Certes/Certes.csproj
+++ b/src/Certes/Certes.csproj
@@ -47,7 +47,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net462'" />
   </ItemGroup>
 
diff --git a/src/Certes/Pkcs/PfxBuilder.cs b/src/Certes/Pkcs/PfxBuilder.cs
index b67b59cd..c0e8a06c 100644
--- a/src/Certes/Pkcs/PfxBuilder.cs
+++ b/src/Certes/Pkcs/PfxBuilder.cs
@@ -111,7 +111,7 @@ private IList<X509Certificate> FindIssuers()
                     Cert = cert
                 });
 
-            var rootCerts = new HashSet(certificates.Where(c => c.IsRoot).Select(c => new TrustAnchor(c.Cert, null)));
+            var rootCerts = new HashSet<TrustAnchor>(certificates.Where(c => c.IsRoot).Select(c => new TrustAnchor(c.Cert, null)));
             var intermediateCerts = certificates.Where(c => !c.IsRoot).Select(c => c.Cert).ToList();
             intermediateCerts.Add(certificate);
 
@@ -125,10 +125,8 @@ private IList<X509Certificate> FindIssuers()
                 IsRevocationEnabled = false
             };
 
-            builderParams.AddStore(
-                X509StoreFactory.Create(
-                    "Certificate/Collection",
-                    new X509CollectionStoreParameters(intermediateCerts)));
+            var x509CertStore = CollectionUtilities.CreateStore(intermediateCerts);
+            builderParams.AddStoreCert(x509CertStore);
 
             var builder = new PkixCertPathBuilder();
             var result = builder.Build(builderParams);