diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
index d812ae0d8f34..6591bf3c5b55 100755
--- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
+++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -101,9 +101,6 @@
 
   <!-- Remove this after fixing: https://github.com/Azure/azure-sdk-for-java/issues/5030 -->
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files=".*CredentialBuilderBase.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files=".*CreateKeyOptions.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
-            files=".*LocalKeyCryptographyClient.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files=".*SearchIndexClientBuilder.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck"
             files=".*SearchServiceClientBuilder.java"/>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/LocalKeyCryptographyClient.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/LocalKeyCryptographyClient.java
index a38f935b7c0b..281d40cf5bb5 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/LocalKeyCryptographyClient.java
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/LocalKeyCryptographyClient.java
@@ -17,7 +17,7 @@
 import reactor.core.publisher.Mono;
 
 abstract class LocalKeyCryptographyClient {
-    CryptographyServiceClient serviceClient;
+    final CryptographyServiceClient serviceClient;
 
     LocalKeyCryptographyClient(CryptographyServiceClient serviceClient) {
         this.serviceClient = serviceClient;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateEcKeyOptions.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateEcKeyOptions.java
index 4f112ed80a29..b378e4dff22e 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateEcKeyOptions.java
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateEcKeyOptions.java
@@ -6,7 +6,6 @@
 import com.azure.core.annotation.Fluent;
 
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -30,8 +29,7 @@ public class CreateEcKeyOptions extends CreateKeyOptions {
      * @param name The name of the Ec key.
      */
     public CreateEcKeyOptions(String name) {
-        super.name = name;
-        this.keyType = KeyType.EC;
+        super(name, KeyType.EC);
     }
 
     /**
@@ -62,7 +60,7 @@ public CreateEcKeyOptions setCurveName(KeyCurveName curveName) {
      */
     @Override
     public CreateEcKeyOptions setKeyOperations(KeyOperation... keyOperations) {
-        this.keyOperations = Arrays.asList(keyOperations);
+        super.setKeyOperations(keyOperations);
         return this;
     }
 
@@ -121,7 +119,8 @@ public CreateEcKeyOptions setEnabled(Boolean enabled) {
      */
     public CreateEcKeyOptions setHardwareProtected(Boolean hardwareProtected) {
         this.hardwareProtected = hardwareProtected;
-        this.keyType = hardwareProtected ? KeyType.EC_HSM : KeyType.EC;
+        KeyType keyType = hardwareProtected ? KeyType.EC_HSM : KeyType.EC;
+        setKeyType(keyType);
         return this;
     }
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateKeyOptions.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateKeyOptions.java
index bd9340ce910e..6ef9e52226e4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateKeyOptions.java
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateKeyOptions.java
@@ -15,11 +15,20 @@
  */
 @Fluent
 public class CreateKeyOptions {
+    /**
+     * The key name.
+     */
+    private final String name;
 
     /**
-     * Determines whether the object is enabled.
+     * The type of the key.
      */
-    private Boolean enabled;
+    private KeyType keyType;
+
+    /**
+     * The key operations.
+     */
+    private List<KeyOperation> keyOperations;
 
     /**
      * Not before date in UTC.
@@ -37,21 +46,9 @@ public class CreateKeyOptions {
     private Map<String, String> tags;
 
     /**
-     * The type of the key.
-     */
-    KeyType keyType;
-
-    /**
-     * The key operations.
-     */
-    List<KeyOperation> keyOperations;
-
-    /**
-     * The key name.
+     * Determines whether the object is enabled.
      */
-    String name;
-
-    CreateKeyOptions() { }
+    private Boolean enabled;
 
     /**
      * Creates instance of KeyCreateOptions with {@code name} as key name and {@code keyType} as type of the key.
@@ -92,6 +89,10 @@ public KeyType getKeyType() {
         return this.keyType;
     }
 
+    void setKeyType(KeyType keyType) {
+        this.keyType = keyType;
+    }
+
     /**
      * Set the {@link OffsetDateTime notBefore} UTC time.
      *
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateRsaKeyOptions.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateRsaKeyOptions.java
index d0c10f2f86af..d563c796a6c8 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateRsaKeyOptions.java
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/CreateRsaKeyOptions.java
@@ -6,7 +6,6 @@
 import com.azure.core.annotation.Fluent;
 
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -30,8 +29,7 @@ public class CreateRsaKeyOptions extends CreateKeyOptions {
      * @param name The name of the key.
      */
     public CreateRsaKeyOptions(String name) {
-        super.name = name;
-        this.keyType = KeyType.RSA;
+        super(name, KeyType.RSA);
     }
 
     /**
@@ -62,7 +60,7 @@ public CreateRsaKeyOptions setKeySize(Integer keySize) {
      */
     @Override
     public CreateRsaKeyOptions setKeyOperations(KeyOperation... keyOperations) {
-        this.keyOperations = Arrays.asList(keyOperations);
+        super.setKeyOperations(keyOperations);
         return this;
     }
 
@@ -120,7 +118,8 @@ public CreateRsaKeyOptions setEnabled(Boolean enabled) {
      */
     public CreateRsaKeyOptions setHardwareProtected(Boolean hardwareProtected) {
         this.hardwareProtected = hardwareProtected;
-        this.keyType = hardwareProtected ? KeyType.RSA_HSM : KeyType.RSA;
+        KeyType keyType = hardwareProtected ? KeyType.RSA_HSM : KeyType.RSA;
+        setKeyType(keyType);
         return this;
     }