diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index ea09d2e..a9bafb3 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -182,6 +182,8 @@
                 <include>introspect.war</include>
                 <include>premiuminfo.war</include>
                 <include>samplerequest.war</include>
+                <include>selfserviceportal.war</include>
+                <include>spprovisionservice.war</include>
             </includes>
         </fileSet>
 
diff --git a/modules/idsconfig/mobile-connect.xml b/modules/idsconfig/mobile-connect.xml
index 0420d4c..ff6d9a9 100755
--- a/modules/idsconfig/mobile-connect.xml
+++ b/modules/idsconfig/mobile-connect.xml
@@ -14,7 +14,7 @@
     <IsSpValidationDisabled>true</IsSpValidationDisabled>
     <GSMAExchangeConfig>
         <SOHost>integration-axiatagroup.apiexchange.org</SOHost>
-        <Organization>axiaD:\1.6-RC2\log\mobile-connect.xmltagroup</Organization>
+        <Organization>axiatagroup</Organization>
         <AuthToken>d0f865b4453be954b03b8b67556a395</AuthToken>
         <ServingOperator>
             <mcc>413</mcc>
@@ -249,7 +249,7 @@
             <ClassName>com.wso2telco.claims.RemoteClaimsTelco</ClassName>
         </OperatorData>
     </OperatorsList>
-
+    <SeamlessProvisioningEnabled>true</SeamlessProvisioningEnabled>
     <DiscoveryConfigs>
         <Auth_clientId>J2lAGcsgEILuhiSyPwsljG4OoxzyIiaX</Auth_clientId>
         <Auth_clientSecret>EBmKGJmSsOsniAXY</Auth_clientSecret>
@@ -289,13 +289,13 @@
     </OperatorDiscoveryNamesMapping>
 
     <SelfServicePortal>
-        <SPOAuthClientKey></SPOAuthClientKey>
-        <SPOAuthClientSecret></SPOAuthClientSecret>
-        <UILoginUrl>https://localhost:9443/selfserviceportal/#/login</UILoginUrl>
-        <TokenEndpoint>https://localhost:9443/oauth2/token</TokenEndpoint>
-        <CallbackUrl>https://localhost:9443/selfserviceportal/api/v1/auth/callback</CallbackUrl>
-        <UserInfoCall>https://localhost:9443/oauth2/userinfo?schema=openid</UserInfoCall>
-        <AuthorizeCall>https://localhost:9443/authproxy/oauth2/authorize/operator/${operator}</AuthorizeCall>
+        <SPOAuthClientKey>8iwbH6Gtc_1LluEHxZxZw7k5Qh4a</SPOAuthClientKey>
+        <SPOAuthClientSecret>HDagnd6nncGHmTgEbjfON0WCLzEa</SPOAuthClientSecret>
+        <UILoginUrl>https://localhost:9444/selfserviceportal/#/login</UILoginUrl>
+        <TokenEndpoint>https://localhost:9444/oauth2/token</TokenEndpoint>
+        <CallbackUrl>https://localhost:9444/selfserviceportal/api/v1/auth/callback</CallbackUrl>
+        <UserInfoCall>https://localhost:9444/oauth2/userinfo?schema=openid</UserInfoCall>
+        <AuthorizeCall>https://localhost:9444/authproxy/oauth2/authorize/operator/${operator}</AuthorizeCall>
         <DiscoveryAPICall></DiscoveryAPICall>
         <DiscoveryAPIToken></DiscoveryAPIToken>
         <MsisdnClaim>msisdn</MsisdnClaim> <!-- MSISDN claim on user info call -->
@@ -325,34 +325,34 @@
         <ApiManagerUrl>https://localhost:9443</ApiManagerUrl>
         <MigUserName>admin</MigUserName>
         <MigUserPassword>admin</MigUserPassword>
-        <AuthUrl>https://localhost:9444/authorize/v1/spark/oauth2/authorize</AuthUrl>
-        <TokenUrl>https://localhost:9444/token/v1/spark/oauth2/token</TokenUrl>
-        <AmTokenUrl>https://localhost:9444/token</AmTokenUrl>
+        <AuthUrl>https://localhost:9444/authorize/v1/${operator}/oauth2/authorize</AuthUrl>
+        <TokenUrl>https://localhost:9444/oauth2/token</TokenUrl>
+        <AmTokenUrl>https://localhost:9443/token</AmTokenUrl>
         <UserInfoUrl>https://localhost:9444/oauth2/userinfo</UserInfoUrl>
         <ApiConfigs>
             <Api>
                 <ApiName>Authorize</ApiName>
                 <ApiVersion>v1</ApiVersion>
                 <ApiProvider>admin</ApiProvider>
-                <ApiTier>Gold</ApiTier>
+                <ApiTier>Unlimited</ApiTier>
             </Api>
             <Api>
                 <ApiName>authorizemnv</ApiName>
                 <ApiVersion>v1</ApiVersion>
                 <ApiProvider>admin</ApiProvider>
-                <ApiTier>Gold</ApiTier>
+                <ApiTier>Unlimited</ApiTier>
             </Api>
             <Api>
                 <ApiName>token</ApiName>
                 <ApiVersion>v1</ApiVersion>
                 <ApiProvider>admin</ApiProvider>
-                <ApiTier>Gold</ApiTier>
+                <ApiTier>Unlimited</ApiTier>
             </Api>
             <Api>
                 <ApiName>tokenmnv</ApiName>
                 <ApiVersion>v1</ApiVersion>
                 <ApiProvider>admin</ApiProvider>
-                <ApiTier>Gold</ApiTier>
+                <ApiTier>Unlimited</ApiTier>
             </Api>
         </ApiConfigs>
         <OauthVersion>OAuth-2.0</OauthVersion>
diff --git a/modules/idsconfig/scope-config.xml b/modules/idsconfig/scope-config.xml
index 3f9db7b..3f50ecb 100755
--- a/modules/idsconfig/scope-config.xml
+++ b/modules/idsconfig/scope-config.xml
@@ -641,5 +641,11 @@
                 <ClaimValue>email</ClaimValue>
             </Claims>
         </Scope>
+        <Scope>
+            <Name>openid</Name>
+            <Claims>
+                <ClaimValue>msisdn</ClaimValue>
+            </Claims>
+        </Scope>
     </UserInfoScopes>
 </ScopeConfigs>
\ No newline at end of file
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 98861e7..0d49585 100755
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -143,9 +143,15 @@
                                 <featureArtifactDef>
                                     com.wso2telco.ids:com.wso2telco.ids.saaserver.feature:${com.wso2telco.ids.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.selfserviceportal.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     com.wso2telco.ids:com.wso2telco.ids.samplerequest.feature:${com.wso2telco.ids.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    com.wso2telco.ids:com.wso2telco.ids.spprovisionservice.feature:${com.wso2telco.ids.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     com.wso2telco.ids:com.wso2telco.ids.urlshorten.feature:${com.wso2telco.ids.version}
                                 </featureArtifactDef>
@@ -944,6 +950,16 @@
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
+				                <feature>
+				                    <id>com.wso2telco.ids.selfserviceportal.feature.group</id>
+			    	                <version>${com.wso2telco.ids.version}</version>
+			    	            </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.spprovisionservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
@@ -1087,12 +1103,21 @@
                                     <id>com.wso2telco.ids.saaserver.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
-
                                 <feature>
                                     <id>com.wso2telco.ids.samplerequest.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
 
+                                <feature>
+                                    <id>com.wso2telco.ids.selfserviceportal.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.spprovisionservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
@@ -1577,6 +1602,15 @@
                                     <id>com.wso2telco.ids.samplerequest.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.spprovisionservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.selfserviceportal.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
 
                                 <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
@@ -2044,6 +2078,15 @@
                                     <id>com.wso2telco.ids.samplerequest.feature.group</id>
                                     <version>${com.wso2telco.ids.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>com.wso2telco.ids.spprovisionservice.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.ids.selfserviceportal.feature.group</id>
+                                    <version>${com.wso2telco.ids.version}</version>
+                                </feature>
 
                                 <feature>
                                     <id>com.wso2telco.ids.sessionupdater.ui.feature.group</id>
diff --git a/pom.xml b/pom.xml
index 5da7d66..f76a222 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1211,11 +1211,21 @@
                 <artifactId>com.wso2telco.ids.samplerequest.feature</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.spprovisionservice.feature</artifactId>
+                <version>${com.wso2telco.ids.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.wso2telco.ids</groupId>
                 <artifactId>com.wso2telco.ids.tokenintrospection</artifactId>
                 <version>${com.wso2telco.ids.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.wso2telco.ids</groupId>
+                <artifactId>com.wso2telco.ids.selfserviceportal.feature</artifactId>
+                <version>${com.wso2telco.ids.version}</version>
+            </dependency>
 
             <!--custom webapps' runtime environment dependencies -->
             <dependency>
@@ -1373,7 +1383,7 @@
     <properties>
 
         <!-- Telco dependency's version-->
-        <com.wso2telco.ids.version>2.4.0-rc1</com.wso2telco.ids.version>
+        <com.wso2telco.ids.version>2.4.0-SNAPSHOT</com.wso2telco.ids.version>
         <com.wso2telco.core.version>2.4.4-SNAPSHOT</com.wso2telco.core.version>
 
         <!--Carbon Identity Framework Version-->