diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh
index 2fe96271..9f7f6147 100644
--- a/modules/scripts/change-ip.sh
+++ b/modules/scripts/change-ip.sh
@@ -500,5 +500,12 @@ if [ -e "../conf/identity/identity-providers/iot_default.xml-e" ]; then
         rm -f ../conf/identity/identity-providers/iot_default.xml-e
 fi
 
+echo ""
+echo "Storing JWT public cert in client truststore"
+keytool -exportcert -alias wso2carbon -keystore ../repository/resources/security/wso2carbonjwt.jks -rfc -storepass wso2carbon -file ./tmp/jwtcert
+keytool -importcert -alias wso2carbonjwt -keystore ../repository/resources/security/client-truststore.jks -storepass wso2carbon -file ./tmp/jwtcert -noprompt
+
+sed -i -e 's/<Parameter Name="wso2.org\/products\/iot">.*/<Parameter Name="wso2.org\/products\/iot">wso2carbonjwt<\/Parameter>/' ../conf/etc/webapp-authenticator-config.xml
+
 echo ""
 echo "Configuration Completed!!!"