diff --git a/distribution/emm-community/src/conf/deployment.toml b/distribution/emm-community/src/conf/deployment.toml
index d72bae2..84594e5 100644
--- a/distribution/emm-community/src/conf/deployment.toml
+++ b/distribution/emm-community/src/conf/deployment.toml
@@ -101,7 +101,7 @@ enable = false
 config_endpoint = "https://localhost:8080/auth/v1"
 auth_token = ""
 
-#[apim.key_manager]
+[apim.key_manager]
 #service_url = "https://localhost:${mgt.transport.https.port}/services/"
 #username = "$ref{super_admin.username}"
 #password = "$ref{super_admin.password}"
@@ -109,7 +109,7 @@ auth_token = ""
 #pool.max_idle = 100
 #key_validation_handler_type = "default"
 #key_validation_handler_type = "custom"
-#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler"
+key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
 
 #[apim.idp]
 #server_url = "https://localhost:${mgt.transport.https.port}"
@@ -255,7 +255,7 @@ password = "${admin.password}"
 'header.X-WSO2-KEY-MANAGER' = "default"
 
 [apim.sync_runtime_artifacts.gateway.skip_list]
-apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"]
+apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"]
 sequences = ["_api_registration_fault_.xml"]
 
 [transport.https.properties]
diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
index f26ca2b..e270048 100644
--- a/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -95,10 +95,11 @@
             <outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory>
             <includes>
                 <include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include>
+                <include>org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension</include>
             </includes>
             <!--<useProjectArtifact>false</useProjectArtifact>-->
             <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->
             <!--<unpack>false</unpack>-->
         </dependencySet>
     </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml
index 6887fed..40bd1e2 100644
--- a/iot-core/src/core/conf/deployment.toml
+++ b/iot-core/src/core/conf/deployment.toml
@@ -104,7 +104,7 @@ enable = false
 config_endpoint = "https://localhost:8080/auth/v1"
 auth_token = ""
 
-#[apim.key_manager]
+[apim.key_manager]
 #service_url = "https://localhost:${mgt.transport.https.port}/services/"
 #username = "$ref{super_admin.username}"
 #password = "$ref{super_admin.password}"
@@ -112,7 +112,7 @@ auth_token = ""
 #pool.max_idle = 100
 #key_validation_handler_type = "default"
 #key_validation_handler_type = "custom"
-#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler"
+key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
 
 #[apim.idp]
 #server_url = "https://localhost:${mgt.transport.https.port}"
@@ -258,7 +258,7 @@ password = "${admin.password}"
 'header.X-WSO2-KEY-MANAGER' = "default"
 
 [apim.sync_runtime_artifacts.gateway.skip_list]
-apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"]
+apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"]
 sequences = ["_api_registration_fault_.xml"]
 
 [transport.https.properties]