diff --git a/distribution/iot-community/target/timestamp b/distribution/iot-community/target/timestamp
index 4835c52..a036c8a 100644
Binary files a/distribution/iot-community/target/timestamp and b/distribution/iot-community/target/timestamp differ
diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index 81e92d1..ee3864d 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -36,6 +36,10 @@
             <groupId>com.h2database.wso2</groupId>
             <artifactId>h2-database-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
index d8c350c..d3e55ad 100644
--- a/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -85,4 +85,15 @@
         </file>
     </files>
 
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory>
+            <includes>
+                <include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include>
+            </includes>
+            <!--<useProjectArtifact>false</useProjectArtifact>-->
+            <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->
+            <!--<unpack>false</unpack>-->
+        </dependencySet>
+    </dependencySets>
 </assembly>
diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml
index a4c16d7..4b63f91 100644
--- a/iot-core/src/core/conf/deployment.toml
+++ b/iot-core/src/core/conf/deployment.toml
@@ -302,3 +302,10 @@ maxHttpHeaderSize="16384"
 [transport.http.properties]
 maxHttpHeaderSize="16384"
 
+[oauth.grant_type.jwt_bearer]
+grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
+
+[[oauth.custom_grant_type]]
+name="access_token"
+grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
+grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b5cb7ff..f504547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,11 @@
                 <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
 
             <!--Orbit dependencies-->
             <dependency>