diff --git a/internal/legacydb/legacydb.go b/internal/legacydb/legacydb.go
index 12beafd..8594a9b 100644
--- a/internal/legacydb/legacydb.go
+++ b/internal/legacydb/legacydb.go
@@ -765,15 +765,15 @@ func parseSubjectStringComponent(identifier, value string, res *x509.Certificate
 	case "commonName":
 		res.Subject.CommonName = value
 		res.DNSNames = append(res.DNSNames, value)
-	case "organizationName":
+	case "O", "organizationName":
 		res.Subject.Organization = append(res.Subject.Organization, value)
-	case "organizationalUnitName":
+	case "OU", "organizationalUnitName":
 		res.Subject.OrganizationalUnit = append(res.Subject.OrganizationalUnit, value)
-	case "localityName":
+	case "L", "localityName":
 		res.Subject.Locality = append(res.Subject.Locality, value)
-	case "stateOrProvinceName":
+	case "ST", "stateOrProvinceName":
 		res.Subject.Province = append(res.Subject.Province, value)
-	case "countryName":
+	case "C", "countryName":
 		res.Subject.Country = append(res.Subject.Country, value)
 	case "emailAddress":
 		res.EmailAddresses = append(res.EmailAddresses, value)