diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
index 6501f3dd8ef6..f071184fa084 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
@@ -2586,12 +2586,15 @@
     </APIResponse>
 
     <CacheInvalidator>
-        <ActiveMQ>
-            <BrokerURL>failover:tcp://localhost:61616</BrokerURL>
+        <CacheInvalidator>
+        <MB>
             <Enabled>false</Enabled>
+            <Type>jms</Type>
+            <InitialNamingFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</InitialNamingFactory>
+            <ProviderURL>failover:tcp://localhost:61616</ProviderURL>
             <TopicName>ISCacheInvalidation</TopicName>
             <ProducerName>producer1</ProducerName>
             <HybridMode>false</HybridMode>
-        </ActiveMQ>
+        </MB>
     </CacheInvalidator>
 </Server>
diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
index 6be3e85a1088..f1a3615c26d1 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -3969,15 +3969,19 @@
 
     <SuperTenantAliasInPublicUrl>{{super_tenant.alias_in_public_url}}</SuperTenantAliasInPublicUrl>
 
-    {% if cache_invalidator.active_mq.broker_url is defined %}
+    {% if cache_invalidator.mb.enabled is defined %}
     <CacheInvalidator>
-        <ActiveMQ>
-           <BrokerURL>{{cache_invalidator.active_mq.broker_url}}</BrokerURL>
-           <Enabled>{{cache_invalidator.active_mq.enabled}}</Enabled>
-           <TopicName>{{cache_invalidator.active_mq.topic_name}}</TopicName>
-           <ProducerName>{{cache_invalidator.active_mq.producer_name}}</ProducerName>
-           <HybridMode>{{cache_invalidator.active_mq.hybrid_mode_enabled}}</HybridMode>
-        </ActiveMQ>
+        <MB>
+            <Enabled>{{cache_invalidator.mb.enabled}}</Enabled>
+            <Type>{{cache_invalidator.mb.broker_type}}</Type>
+            <InitialNamingFactory>{{cache_invalidator.mb.initial_naming_factory}}</InitialNamingFactory>
+            <ProviderURL>{{cache_invalidator.mb.provider_url}}</ProviderURL>
+            <TopicName>{{cache_invalidator.mb.topic_name}}</TopicName>
+            <ProducerName>{{cache_invalidator.mb.producer_name}}</ProducerName>
+            <Username>{{cache_invalidator.mb.username}}</Username>
+            <Password>{{cache_invalidator.mb.password}}</Password>
+            <HybridMode>{{cache_invalidator.mb.hybrid_mode_enabled}}</HybridMode>
+        </MB>
     </CacheInvalidator>
     {% endif %}