diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
old mode 100644
new mode 100755
index 50501be6d..5700e4289
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -422,9 +422,6 @@
                             org.wso2.carbon.identity.core.dao; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.persistence; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.util; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.keystore; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.keystore.service; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.user.core,
                             org.wso2.carbon.user.core.claim,
                             org.wso2.carbon.user.core.service,
@@ -434,7 +431,11 @@
                             org.wso2.carbon.identity.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.handler; version="${carbon.identity.package.import.version.range}",
-
+                            org.wso2.carbon.security; version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.keystore;
+                            version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.keystore.service;
+                            version="${carbon.security.keystore.service.version.range}",
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.identity.sso.saml.internal,
diff --git a/pom.xml b/pom.xml
index 80a96ceb1..d2f78f522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,6 +486,7 @@
         <carbon.user.api.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.user.api.imp.pkg.version.range>
         <carbon.kernel.registry.imp.pkg.version>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version>
         <carbon.identity.package.import.version.range>[5.0.0, 7.0.0)</carbon.identity.package.import.version.range>
+        <carbon.security.keystore.service.version.range>[1.0.0, 2.0.0)</carbon.security.keystore.service.version.range>
 
         <osgi.service.http.imp.pkg.version.range>[1.2.1, 2.0.0)</osgi.service.http.imp.pkg.version.range>
         <osgi.util.tracker.imp.pkg.version.range>[1.5.1, 2.0.0)</osgi.util.tracker.imp.pkg.version.range>