diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 29e26584..1455c752 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -78,7 +78,7 @@
                 <!--below dependency fails synapse startup-->
                 <exclude>**/repository/components/plugins/asm-all_4.1.0.wso2v1.jar</exclude>
 
-
+                <exclude>**/conf/identity/sso-idp-config.xml</exclude>
             </excludes>
         </fileSet>
 
diff --git a/modules/distribution/src/repository/conf/carbon.xml b/modules/distribution/src/repository/conf/carbon.xml
index 59af020b..1d3e2ee5 100644
--- a/modules/distribution/src/repository/conf/carbon.xml
+++ b/modules/distribution/src/repository/conf/carbon.xml
@@ -45,12 +45,12 @@
 	   This is will become part of the End Point Reference of the
 	   services deployed on this server instance.
 	-->
-	<!--HostName>www.wso2.org</HostName-->
+	<HostName>localhost</HostName>
 
 	<!--
 	Host name to be used for the Carbon management console
 	-->
-	<!--MgtHostName>mgt.wso2.org</MgtHostName-->
+	<MgtHostName>localhost</MgtHostName>
 
 	<!--
 		The URL of the back end server. This is where the admin services are hosted and