diff --git a/Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll b/Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll
deleted file mode 100644
index 9d9b6ac33..000000000
Binary files a/Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll and /dev/null differ
diff --git a/Assets/Mirror/Plugins/BouncyCastle/LICENSE.md b/Assets/Mirror/Plugins/BouncyCastle/LICENSE.md
index 277dcd1eb..92e79017c 100644
--- a/Assets/Mirror/Plugins/BouncyCastle/LICENSE.md
+++ b/Assets/Mirror/Plugins/BouncyCastle/LICENSE.md
@@ -1,3 +1,5 @@
+Version with renamed namespaces to avoid conflicts lives here: https://github.com/MirrorNetworking/bc-csharp
+
 Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,
diff --git a/Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll b/Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll
new file mode 100644
index 000000000..5838952e5
Binary files /dev/null and b/Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll differ
diff --git a/Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll.meta b/Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll.meta
similarity index 100%
rename from Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll.meta
rename to Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll.meta
diff --git a/Assets/Mirror/Transports/Encryption/EncryptedConnection.cs b/Assets/Mirror/Transports/Encryption/EncryptedConnection.cs
index 9515e74db..46c916310 100644
--- a/Assets/Mirror/Transports/Encryption/EncryptedConnection.cs
+++ b/Assets/Mirror/Transports/Encryption/EncryptedConnection.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Security.Cryptography;
 using System.Text;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Agreement;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Generators;
-using Org.BouncyCastle.Crypto.Modes;
-using Org.BouncyCastle.Crypto.Parameters;
+using Mirror.BouncyCastle.Crypto;
+using Mirror.BouncyCastle.Crypto.Agreement;
+using Mirror.BouncyCastle.Crypto.Digests;
+using Mirror.BouncyCastle.Crypto.Generators;
+using Mirror.BouncyCastle.Crypto.Modes;
+using Mirror.BouncyCastle.Crypto.Parameters;
 using UnityEngine.Profiling;
 
 namespace Mirror.Transports.Encryption
diff --git a/Assets/Mirror/Transports/Encryption/EncryptionCredentials.cs b/Assets/Mirror/Transports/Encryption/EncryptionCredentials.cs
index 2e0b04259..f12e4c919 100644
--- a/Assets/Mirror/Transports/Encryption/EncryptionCredentials.cs
+++ b/Assets/Mirror/Transports/Encryption/EncryptionCredentials.cs
@@ -1,14 +1,14 @@
 using System;
 using System.IO;
-using Org.BouncyCastle.Asn1.Pkcs;
-using Org.BouncyCastle.Asn1.X509;
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Generators;
-using Org.BouncyCastle.X509;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Pkcs;
-using Org.BouncyCastle.Security;
+using Mirror.BouncyCastle.Asn1.Pkcs;
+using Mirror.BouncyCastle.Asn1.X509;
+using Mirror.BouncyCastle.Crypto;
+using Mirror.BouncyCastle.Crypto.Digests;
+using Mirror.BouncyCastle.Crypto.Generators;
+using Mirror.BouncyCastle.X509;
+using Mirror.BouncyCastle.Crypto.Parameters;
+using Mirror.BouncyCastle.Pkcs;
+using Mirror.BouncyCastle.Security;
 using UnityEngine;
 
 namespace Mirror.Transports.Encryption
diff --git a/Assets/Mirror/Transports/Encryption/PubKeyInfo.cs b/Assets/Mirror/Transports/Encryption/PubKeyInfo.cs
index d98906131..c33229891 100644
--- a/Assets/Mirror/Transports/Encryption/PubKeyInfo.cs
+++ b/Assets/Mirror/Transports/Encryption/PubKeyInfo.cs
@@ -1,5 +1,5 @@
 using System;
-using Org.BouncyCastle.Crypto;
+using Mirror.BouncyCastle.Crypto;
 
 public struct PubKeyInfo
 {