diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 3f2ba054..c8c6b404 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -72,6 +72,7 @@
                 <exclude>**/registry.xml</exclude>
                 <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
+                <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/lib/httpmime*</exclude>
@@ -253,6 +254,7 @@
                 <exclude>**/web-apps/**</exclude>
                 <exclude>**/appm-tenant-conf.xml</exclude>
 				<exclude>**/client-truststore.jks</exclude>
+				<exclude>**/wso2carbon.jks</exclude>
             </excludes>
 
         </fileSet>
@@ -326,6 +328,7 @@
             </outputDirectory>
 			<excludes>
 				<exclude>**/client-truststore.jks</exclude>
+				<exclude>**/wso2carbon.jks</exclude>
 			</excludes>
         </fileSet>
 
@@ -695,6 +698,7 @@
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
 				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
+				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -978,6 +982,7 @@
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
 				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
+				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -1615,6 +1620,16 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
+
+        <!-- copying server scripts -->
+        <file>
+            <source>../scripts/change-ip.sh</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/scripts
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+
         <file>
             <source>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
@@ -1967,6 +1982,21 @@
 			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
 			<fileMode>644</fileMode>
 		</file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 		<!--End-->
     </files>
 </assembly>
diff --git a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
index 3fb420bd..98615040 100644
--- a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
@@ -36,7 +36,7 @@
 	</ProvisioningConnectorConfigs>
 	<!--<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>-->
 	<ClaimConfig></ClaimConfig>
-	<Certificate>MIIDSTCCAjGgAwIBAgIERUubMzANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzAzMjEwOTEzMDdaFw0xNzA2MTkwOTEzMDdaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu8lfLCQV2hbiz8OGA8baKI1E1cgE/QLKefa4Od2G2KextaAwSESr5ICakVX8w6tU5+IhKYQQKt9U3/U0ae9tXf04g6iWh0dRllsr9mOgjSZxQK09/ygUsFH8syL5aD3heRUYzJWZ/KOsd57BXuI2QZnuEjN0g0+5jNvnswfwD/tM01totaJpI3xN+2JZsaBRCc0G5yA/pdW83Aa4IE30EL57wkK7u8YDl3UTcmi+HO74XQmK1VEqSnA+/mFo3M16cRlm2PTZ2Z1E5gd4j+5sV1P5v63uqyFniEU0zPXforBb06pgSBoIRQBintSSDyEmyuVzW0pc2eYC5Dhfgk337QIDAQABoyEwHzAdBgNVHQ4EFgQU4lneZCvKn04NH5DtJItdRXdXankwDQYJKoZIhvcNAQELBQADggEBAEnCNr0JEcAxtF/ypwGgFu1rYOv3i02PB4jDWbFj8s58l1zF1tMr480khVX4d3AmLjsUpvV+Jg83JFIk1rJFLEb48EFv0nJ/G7pTQrCypNKozyuyLzx5UvKNFBMmnGvkHVqt6j4MSiOjnRdlo7ofDluA/umSkSf/VmsOIZ+5610pCJpahnPUkb8GYK0HcwNV2NLU/0X4nSjKjGwWYv0tX8XW8RwJKb/r0GDehA8PESi76XOVrpXSjP9WPK8XaK//8B0SH3hm0xpzmSQYgtkNQwP2MqBe/ZEUuKxrn3pP6oxo9RxeSIQ8dTLiBA/mcsBmAlpQPPi0LqqDKpkyHt8Ar2w=</Certificate>
+	<Certificate>MIIDSTCCAjGgAwIBAgIEAoLQ/TANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzA3MTkwNjUyNTFaFw0yNzA3MTcwNjUyNTFaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAluZFdW1ynitztkWLC6xKegbRWxky+5P0p4ShYEOkHs30QI2VCuR6Qo4Bz5rTgLBrky03W1GAVrZxuvKRGj9V9+PmjdGtau4CTXu9pLLcqnruaczoSdvBYA3lS9a7zgFU0+s6kMl2EhB+rk7gXluEep7lIOenzfl2f6IoTKa2fVgVd3YKiSGsyL4tztS70vmmX121qm0sTJdKWP4HxXyqK9neolXI9fYyHOYILVNZ69z/73OOVhkh/mvTmWZLM7GM6sApmyLX6OXUp8z0pkY+vT/9+zRxxQs7GurC4/C1nK3rI/0ySUgGEafO1atNjYmlFN+M3tZX6nEcA6g94IavyQIDAQABoyEwHzAdBgNVHQ4EFgQUtS8kIYxQ8UVvVrZSdgyide9OHxUwDQYJKoZIhvcNAQELBQADggEBABfk5mqsVUrpFCYTZZhOxTRRpGXqoW1G05bOxHxs42Paxw8rAJ06Pty9jqM1CgRPpqvZa2lPQBQqZrHkdDE06q4NG0DqMH8NT+tNkXBe9YTre3EJCSfsvswtLVDZ7GDvTHKojJjQvdVCzRj6XH5Truwefb4BJz9APtnlyJIvjHk1hdozqyOniVZd0QOxLAbcdt946chNdQvCm6aUOputp8Xogr0KBnEy3U8es2cAfNZaEkPU8Va5bU6Xjny8zGQnXCXxPKp7sMpgO93nPBt/liX1qfyXM7xEotWoxmm6HZx8oWQ8U5aiXjZ5RKDWCCq4ZuXl6wVsUz1iE61suO5yWi8=</Certificate>
 	<PermissionAndRoleConfig></PermissionAndRoleConfig>
 	<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
 </IdentityProvider>
\ No newline at end of file
diff --git a/modules/distribution/src/core/resources/security/client-truststore.jks b/modules/distribution/src/core/resources/security/client-truststore.jks
index c477431c..3b9fdfb9 100644
Binary files a/modules/distribution/src/core/resources/security/client-truststore.jks and b/modules/distribution/src/core/resources/security/client-truststore.jks differ
diff --git a/modules/distribution/src/core/resources/security/wso2carbon.jks b/modules/distribution/src/core/resources/security/wso2carbon.jks
new file mode 100644
index 00000000..b4b6220b
Binary files /dev/null and b/modules/distribution/src/core/resources/security/wso2carbon.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
index c477431c..3b9fdfb9 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
index 11686670..b4b6220b 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
index c477431c..3b9fdfb9 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks and b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
index 11686670..b4b6220b 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks and b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
index c477431c..3b9fdfb9 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
index 11686670..b4b6220b 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
index c477431c..3b9fdfb9 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
index 11686670..b4b6220b 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks differ