diff --git a/modules/analytics/distribution/src/repository/conf/carbon.xml b/modules/analytics/distribution/src/repository/conf/carbon.xml
index 60199811..f2e3ab82 100644
--- a/modules/analytics/distribution/src/repository/conf/carbon.xml
+++ b/modules/analytics/distribution/src/repository/conf/carbon.xml
@@ -75,10 +75,8 @@
     Ex : <Role>.*</Role> means this server can act any role
     -->
     <ServerRoles>
-        <Role>${default.server.role}</Role>
         <Role>${cep.server.role}</Role>
         <Role>${das.server.role}</Role>
-        <Role>${cdmf.platform.role}</Role>
         <Role>${geodashboard.role}</Role>
     </ServerRoles>
 
diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules/core/distribution/src/repository/conf/carbon.xml
index fafaf53c..9e856b84 100644
--- a/modules/core/distribution/src/repository/conf/carbon.xml
+++ b/modules/core/distribution/src/repository/conf/carbon.xml
@@ -77,12 +77,8 @@
 	-->
 	<ServerRoles>
 		<Role>${default.server.role}</Role>
-		<Role>${das.server.role}</Role>
-		<Role>${cep.server.role}</Role>
 		<Role>${cdmf.analytics.role}</Role>
-		<Role>IoTServer</Role>
 		<Role>CDMFPlatform</Role>
-		<Role>GeoDashboard</Role>
 	</ServerRoles>
 
 	<!-- uncommnet this line to subscribe to a bam instance automatically -->