diff --git a/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml b/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml
index af63d2804f..4e9861dab5 100644
--- a/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml
+++ b/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml
@@ -80,6 +80,12 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.ntask.core.service.TaskService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.TenantRegistryLoader,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml
index 383f4de04f..f612914d0c 100644
--- a/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml
+++ b/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml
@@ -124,6 +124,12 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore,
+                            osgi.service;objectClass=org.wso2.carbon.identity.authentication.AuthenticationService,
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml
index 683d5d85d3..9bf736ea01 100644
--- a/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml
+++ b/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml
@@ -89,6 +89,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml
index 271cc88c5c..7ff45c1712 100644
--- a/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml
+++ b/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml
@@ -110,6 +110,12 @@
 			    org.osgi.framework,*;resolution:=optional
 			</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.base.api.ServerConfigurationService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService,
+                            osgi.service;objectClass=org.osgi.service.http.HttpService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml
index f69be84b56..512c14fa5d 100644
--- a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml
+++ b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml
@@ -120,6 +120,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml
index 8c460d838a..5499ffaf94 100644
--- a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml
+++ b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml
@@ -87,6 +87,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml
index 91ae8692a9..23c8121b56 100644
--- a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml
+++ b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml
@@ -95,6 +95,9 @@
 		        	org.osgi.framework,*;resolution:=optional
 			</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml
index 79450018b5..c634b35bfe 100644
--- a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml
+++ b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml
@@ -92,6 +92,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.ndatasource.core.DataSourceService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml
index 85ee9031ac..a562bf6a01 100644
--- a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml
+++ b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml
@@ -110,6 +110,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml
index 959d223077..685d4d951e 100644
--- a/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml
+++ b/components/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml
@@ -112,6 +112,10 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.ui.UIOutputAuthorizationService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml
index 183e109bd1..8e042deb75 100644
--- a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml
+++ b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml
@@ -99,6 +99,11 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.securevault.SecretCallbackHandlerService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml
index 12d66afd9b..fe799d058e 100644
--- a/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml
+++ b/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml
@@ -88,6 +88,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml
index 1bd4ccb1e5..41cc892807 100644
--- a/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml
+++ b/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml
@@ -110,6 +110,14 @@
                         <Axis2RequiredServices>
                             org.wso2.carbon.event.publisher.core.EventPublisherService
                         </Axis2RequiredServices>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml
index 82a22fb298..34cb6b8c81 100644
--- a/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml
+++ b/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml
@@ -91,6 +91,10 @@
                               *;resolution:=optional,
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>
diff --git a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml
index d16929c0fb..339b6a66c7 100644
--- a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml
+++ b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml
@@ -87,6 +87,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml
index 1f1bdcb976..55044e5db6 100644
--- a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml
+++ b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml
@@ -90,6 +90,10 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+                            osgi.service;objectClass=org.osgi.service.http.HttpService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml
index 9d6f03eaf0..6b952008da 100644
--- a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml
+++ b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml
@@ -94,6 +94,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml
index 4dc35ec4c3..55cd27c534 100644
--- a/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml
+++ b/components/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml
@@ -102,6 +102,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeSubscriberService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml
index 00526bea91..a267f53f81 100644
--- a/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml
+++ b/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml
@@ -74,6 +74,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml
index 99034d4401..8e54a70937 100644
--- a/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml
+++ b/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml
@@ -88,6 +88,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml
index 481109cbb1..1764504941 100644
--- a/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml
+++ b/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml
@@ -125,6 +125,15 @@
                         <Axis2RequiredServices>
                             org.wso2.carbon.event.receiver.core.EventReceiverService
                         </Axis2RequiredServices>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService,
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml
index 3584c9bb5b..a1173a4eaf 100644
--- a/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml
+++ b/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml
@@ -90,6 +90,10 @@
                               *;resolution:=optional,
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>
diff --git a/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml
index d1588e1393..83cf7cde86 100644
--- a/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml
+++ b/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml
@@ -84,6 +84,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml
index 0c2ec3edec..e7ae0e19ea 100644
--- a/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml
+++ b/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml
@@ -98,6 +98,10 @@
                         </Import-Package>
                         <Axis2Deployer>EventStreamDeployer</Axis2Deployer>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamListener
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml
index 0f18335a1d..e149f902bb 100644
--- a/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml
+++ b/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml
@@ -85,8 +85,11 @@
                               org.wso2.carbon.event.template.manager.core,
                               *;resolution:=optional,
                           </Import-Package>
-
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>
diff --git a/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml b/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml
index 115d42fd63..2b977b0e07 100644
--- a/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml
+++ b/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml
@@ -102,6 +102,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml b/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml
index 0269e327d4..f36ee5577c 100644
--- a/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml
+++ b/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml
@@ -95,6 +95,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.template.manager.core.TemplateManagerService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml b/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml
index 784730602b..28bee25ec4 100644
--- a/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml
+++ b/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml
@@ -97,6 +97,11 @@
                               *;resolution:=optional
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.template.manager.core.TemplateDeployer,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                              osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>