diff --git a/src/VaultSharp/Core/VaultSharpJsonContext.cs b/src/VaultSharp/Core/VaultSharpJsonContext.cs
index 37a9f28..4c93cbd 100644
--- a/src/VaultSharp/Core/VaultSharpJsonContext.cs
+++ b/src/VaultSharp/Core/VaultSharpJsonContext.cs
@@ -248,6 +248,32 @@ namespace VaultSharp.Core
     [JsonSerializable(typeof(VaultSharp.V1.AuthMethods.GoogleCloud.GoogleCloudAuthMethodInfo))]
     [JsonSerializable(typeof(VaultSharp.V1.AuthMethods.JWT.JWTAuthMethodInfo))]
     [JsonSerializable(typeof(VaultSharp.V1.AuthMethods.Kubernetes.KubernetesAuthMethodInfo))]
+    // PKI Issuers
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Issuers.KeysData>), TypeInfoPropertyName = "SecretPKIIssuersKeysData")]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerResponseData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerConfigResponseData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerConfigRequestData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerConfigResponseData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.IssuerResponseData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.KeysData), TypeInfoPropertyName = "PKIIssuersKeysData")]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Issuers.KeyInfo), TypeInfoPropertyName = "PKIIssuersKeyInfo")]
+    [JsonSerializable(typeof(System.Collections.Generic.Dictionary<string, VaultSharp.V1.SecretsEngines.PKI.Issuers.KeyInfo>), TypeInfoPropertyName = "DictionaryStringPKIIssuersKeyInfo")]
+    // PKI Keys
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Keys.KeysData>), TypeInfoPropertyName = "SecretPKIKeysKeysData")]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Keys.KeyData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Keys.ImportKeyData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Keys.KeyData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Keys.ImportKeyData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Keys.KeysData), TypeInfoPropertyName = "PKIKeysKeysData")]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Keys.KeyInfo), TypeInfoPropertyName = "PKIKeysKeyInfo")]
+    [JsonSerializable(typeof(System.Collections.Generic.Dictionary<string, VaultSharp.V1.SecretsEngines.PKI.Keys.KeyInfo>), TypeInfoPropertyName = "DictionaryStringPKIKeysKeyInfo")]
+    // PKI Roles
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Roles.RolesData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.Commons.Secret<VaultSharp.V1.SecretsEngines.PKI.Roles.RoleData>))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Roles.RoleData))]
+    [JsonSerializable(typeof(VaultSharp.V1.SecretsEngines.PKI.Roles.RolesData))]
     internal partial class VaultSharpJsonContext : JsonSerializerContext
     {
     }
diff --git a/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerFormat.cs b/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerFormat.cs
index 91704b4..6c2df1b 100644
--- a/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerFormat.cs
+++ b/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerFormat.cs
@@ -3,7 +3,11 @@
 
 namespace VaultSharp.V1.SecretsEngines.PKI.Issuers
 {
+#if NET8_0_OR_GREATER
+    [JsonConverter(typeof(JsonStringEnumConverter<IssuerFormat>))]
+#else
     [JsonConverter(typeof(JsonStringEnumConverter))]
+#endif
     public enum IssuerFormat
     {
         /// <summary>
diff --git a/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivetKeyFormat.cs b/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivateKeyFormat.cs
similarity index 83%
rename from src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivetKeyFormat.cs
rename to src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivateKeyFormat.cs
index b1b1694..8b202b2 100644
--- a/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivetKeyFormat.cs
+++ b/src/VaultSharp/V1/SecretsEngines/PKI/Issuers/IssuerPrivateKeyFormat.cs
@@ -1,9 +1,13 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
 namespace VaultSharp.V1.SecretsEngines.PKI.Issuers
 {
+#if NET8_0_OR_GREATER
+    [JsonConverter(typeof(JsonStringEnumConverter<IssuerPrivateKeyFormat>))]
+#else
     [JsonConverter(typeof(JsonStringEnumConverter))]
+#endif
     public enum IssuerPrivateKeyFormat
     {
         /// <summary>
diff --git a/src/VaultSharp/V1/SecretsEngines/PKI/PrivateKeyType.cs b/src/VaultSharp/V1/SecretsEngines/PKI/PrivateKeyType.cs
index c0f5b69..51de083 100644
--- a/src/VaultSharp/V1/SecretsEngines/PKI/PrivateKeyType.cs
+++ b/src/VaultSharp/V1/SecretsEngines/PKI/PrivateKeyType.cs
@@ -3,7 +3,11 @@
 
 namespace VaultSharp.V1.SecretsEngines.PKI
 {
+#if NET8_0_OR_GREATER
+    [JsonConverter(typeof(JsonStringEnumConverter<PrivateKeyType>))]
+#else
     [JsonConverter(typeof(JsonStringEnumConverter))]
+#endif
     public enum PrivateKeyType
     {
         /// <summary>
diff --git a/src/VaultSharp/V1/SecretsEngines/PKI/Roles/PrivateKeyRoleType.cs b/src/VaultSharp/V1/SecretsEngines/PKI/Roles/PrivateKeyRoleType.cs
index 66f85d8..326762a 100644
--- a/src/VaultSharp/V1/SecretsEngines/PKI/Roles/PrivateKeyRoleType.cs
+++ b/src/VaultSharp/V1/SecretsEngines/PKI/Roles/PrivateKeyRoleType.cs
@@ -1,9 +1,13 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
 namespace VaultSharp.V1.SecretsEngines.PKI.Roles
 {
+#if NET8_0_OR_GREATER
+    [JsonConverter(typeof(JsonStringEnumConverter<PrivateKeyRoleType>))]
+#else
     [JsonConverter(typeof(JsonStringEnumConverter))]
+#endif
     public enum PrivateKeyRoleType
     {
         /// <summary>