diff --git a/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc b/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
index 1aef015b57..e28d9891ff 100644
--- a/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
+++ b/CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
@@ -36,6 +36,20 @@
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha256Duplicate           | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha256Update              | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha256Final               | TRUE
+# SHA384 family
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384GetContextSize      | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384Init                | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384Duplicate           | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384Update              | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384Final               | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha384HashAll             | TRUE
+# SHA512 family
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512GetContextSize      | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512Init                | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512Duplicate           | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512Update              | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512Final               | TRUE
+  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceSha512HashAll             | TRUE
 # TLS family
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceTlsInitialize             | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceTlsCtxFree                | TRUE
diff --git a/CryptoPkg/Driver/Packaging/generate_cryptodriver.py b/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
index 003796811f..6fdf5244dd 100644
--- a/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
+++ b/CryptoPkg/Driver/Packaging/generate_cryptodriver.py
@@ -143,7 +143,7 @@ def get_flavors():
             "guid": "d9a75606-caba-4aa0-80a6-591852335400"
         },
         "STANDARD": {
-            "families": ["HMACSHA256", "PKCS", "SHA1", "SHA256", "RANDOM", "TLS", "TLSGET", "TLSSET"],
+            "families": ["HMACSHA256", "PKCS", "SHA1", "SHA256", "SHA384", "SHA512", "RANDOM", "TLS", "TLSGET", "TLSSET"],
             "individuals": ["RsaPkcs1Verify", "RsaNew", "RsaFree", "RsaGetPublicKeyFromX509", "X509GetSubjectName", "X509GetCommonName", "X509GetOrganizationName", "X509GetTBSCert", "RsaPssSign", "RsaPssVerify"],
             "exclude": ["Sha1HashAll", "Sha256HashAll", "Pkcs7Sign", "Pkcs7GetCertificatesList", "ImageTimestampVerify"],
             "guid": "bdee011f-87f2-4a7f-bc5e-44b6b61fef00"