diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index dcc2873242..d0342b2881 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -143,6 +143,12 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.h2database.wso2</groupId>
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
index 81c7e06b5a..044bd2f923 100644
--- a/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
+++ b/components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
@@ -57,17 +57,17 @@
                             org.osgi.service.component,
                             org.apache.commons.logging,
                             javax.xml.*,
-			    javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
+			                javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             org.wso2.carbon.context,
                             org.wso2.carbon.utils.*,
                             org.wso2.carbon.registry.api,
                             org.w3c.dom,
-                            org.apache.velocity,
-                            org.apache.velocity.app,
-                            org.apache.velocity.context,
-                            org.apache.velocity.exception,
-                            org.apache.velocity.runtime.resource,
-                            org.apache.velocity.runtime.resource.loader,
+                            org.apache.velocity;version="${velocity.version}",
+                            org.apache.velocity.app;version="${velocity.version}",
+                            org.apache.velocity.context;version="${velocity.version}",
+                            org.apache.velocity.exception;version="${velocity.version}",
+                            org.apache.velocity.runtime.resource;version="${velocity.version}",
+                            org.apache.velocity.runtime.resource.loader;version="${velocity.version}",
                             org.apache.commons.io,
                             org.apache.axis2.transport.mail,
                             org.wso2.carbon.registry.core.service,
@@ -130,7 +130,7 @@
             <artifactId>axis2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
+            <groupId>org.wso2.orbit.org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>
         <dependency>
diff --git a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
index 896c5ac634..f764fb3da4 100644
--- a/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
+++ b/features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.email.sender.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.orbit.org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,6 +98,9 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.core:${carbon.device.mgt.version}
                                 </bundleDef>
+                                <bundleDef>
+                                    org.wso2.orbit.org.apache.velocity:velocity:${velocity.version}
+                                </bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
diff --git a/pom.xml b/pom.xml
index 0469443014..02aab90e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1343,7 +1343,7 @@
                 <version>${commons.httpclient.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.velocity</groupId>
+                <groupId>org.wso2.orbit.org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
@@ -1863,7 +1863,7 @@
         <httpcore.version>4.3.3.wso2v1</httpcore.version>
         <commons.httpclient.version>3.1.0.wso2v2</commons.httpclient.version>
 
-        <velocity.version>1.7</velocity.version>
+        <velocity.version>1.7.0.wso2v1</velocity.version>
 
         <commons-io.version>2.4.0.wso2v1</commons-io.version>
         <commons-collections.version>3.2.0.wso2v1</commons-collections.version>