diff --git a/adapter/api/proto/wso2/discovery/service/apkmgt/eventds.proto b/adapter/api/proto/wso2/discovery/service/apkmgt/eventds.proto
deleted file mode 100644
index 9a2eeefa0..000000000
--- a/adapter/api/proto/wso2/discovery/service/apkmgt/eventds.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-package discovery.service.apkmgt;
-
-import "wso2/discovery/subscription/event.proto";
-option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/service/apkmgt";
-option java_package = "org.wso2.apk.enforcer.discovery.service.apkmgt";
-option java_outer_classname = "EventServiceProto";
-option java_multiple_files = true;
-option java_generic_services = true;
-
-// [#protodoc-title: EventStreamDS]
-service EventStreamService {
-    rpc StreamEvents (Request) returns (stream wso2.discovery.subscription.Event) {}
-  }
-message Request {
-    string event = 1;
-}
\ No newline at end of file
diff --git a/adapter/api/proto/wso2/discovery/subscription/application.proto b/adapter/api/proto/wso2/discovery/subscription/application.proto
deleted file mode 100644
index 6a3ea7e36..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/application.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-syntax = "proto3";
-
-package wso2.discovery.subscription;
-
-option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription";
-option java_package = "org.wso2.apk.enforcer.discovery.subscription";
-option java_outer_classname = "ApplicationProto";
-option java_multiple_files = true;
-
-// [#protodoc-title: Application]
-
-// Application data model
-message Application {
-    string uuid = 1;
-    string name = 2;
-    string owner = 3;
-    string organization = 4;
-    map<string, string> attributes = 5;
-}
diff --git a/adapter/api/proto/wso2/discovery/subscription/application_key_mapping.proto b/adapter/api/proto/wso2/discovery/subscription/application_key_mapping.proto
deleted file mode 100644
index 6f124e7cd..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/application_key_mapping.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-syntax = "proto3";
-
-package wso2.discovery.subscription;
-
-option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription";
-option java_package = "org.wso2.apk.enforcer.discovery.subscription";
-option java_outer_classname = "ApplicationKeyMappingProto";
-option java_multiple_files = true;
-
-// [#protodoc-title: ApplicationKeyMapping]
-
-// ApplicationKeyMapping data model
-message ApplicationKeyMapping {
-  string applicationUUID = 1;
-  string securityScheme = 2;
-  string applicationIdentifier = 3;
-  string keyType = 4;
-  string envID = 5;
-  int64 timestamp = 6;
-  string organization = 7;
-}
diff --git a/adapter/api/proto/wso2/discovery/subscription/applicationmapping.proto b/adapter/api/proto/wso2/discovery/subscription/applicationmapping.proto
deleted file mode 100644
index 5ae10010b..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/applicationmapping.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-syntax = "proto3";
-
-package wso2.discovery.subscription;
-
-option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription";
-option java_package = "org.wso2.apk.enforcer.discovery.subscription";
-option java_outer_classname = "ApplicationMappingProto";
-option java_multiple_files = true;
-
-// [#protodoc-title: ApplicationMapping]
-
-// ApplicationMapping data model
-message ApplicationMapping {
-    string uuid = 1;
-    string applicationRef = 2;
-    string subscriptionRef = 3;
-    string organization = 4;
-}
diff --git a/adapter/api/proto/wso2/discovery/subscription/event.proto b/adapter/api/proto/wso2/discovery/subscription/event.proto
deleted file mode 100644
index 542ed8a49..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/event.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
- syntax = "proto3";
-
- package wso2.discovery.subscription;
-
- import "wso2/discovery/subscription/application.proto";
- import "wso2/discovery/subscription/applicationmapping.proto";
- import "wso2/discovery/subscription/application_key_mapping.proto";
- import "wso2/discovery/subscription/subscription.proto";
- option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription";
- option java_package = "org.wso2.apk.enforcer.discovery.subscription";
- option java_outer_classname = "EventProto";
- option java_multiple_files = true;
- 
- // [#protodoc-title: Event]
- 
- // Event data model
- message Event {
-     string uuid = 1;
-     int64 timeStamp = 2; 
-     string type = 3;
-     Application application = 4;
-     ApplicationMapping applicationMapping = 5;
-     ApplicationKeyMapping applicationKeyMapping = 6;
-     Subscription subscription = 7;
- }
- 
\ No newline at end of file
diff --git a/adapter/api/proto/wso2/discovery/subscription/subscription.proto b/adapter/api/proto/wso2/discovery/subscription/subscription.proto
deleted file mode 100644
index 2f61bdfb3..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/subscription.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-syntax = "proto3";
-
-package wso2.discovery.subscription;
-
-option go_package = "github.com/wso2/apk/adapter/pkg/discovery/api/wso2/discovery/subscription";
-option java_package = "org.wso2.apk.enforcer.discovery.subscription";
-option java_outer_classname = "SubscriptionProto";
-option java_multiple_files = true;
-
-// [#protodoc-title: Subscription]
-
-// Subscription data model
-message Subscription {
-    string subStatus = 1;
-    string uuid = 2;
-    string organization = 3;
-    SubscribedAPI subscribedApi = 4;
-}
-
-message SubscribedAPI {
-    string name = 1;
-    string version = 2;
-}
diff --git a/adapter/api/proto/wso2/discovery/subscription/url_mapping.proto b/adapter/api/proto/wso2/discovery/subscription/url_mapping.proto
deleted file mode 100644
index ee7f06aa6..000000000
--- a/adapter/api/proto/wso2/discovery/subscription/url_mapping.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-package wso2.discovery.subscription;
-
-option go_package = "github.com/envoyproxy/go-control-plane/wso2/discovery/subscription;subscription";
-option java_package = "org.wso2.apk.enforcer.discovery.subscription";
-option java_outer_classname = "URLMappingProto";
-option java_multiple_files = true;
-
-// [#protodoc-title: URLMapping]
-
-// URLMapping data model
-message URLMapping {
-	string authScheme = 1;
-	string httpMethod = 2;
-	string urlPattern = 3;
-	repeated string scopes = 4;
-}
diff --git a/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/client.pb.go b/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/client.pb.go
index b022f637c..76758c00e 100644
--- a/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/client.pb.go
+++ b/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/client.pb.go
@@ -1,3 +1,19 @@
+//  Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+//
+//  WSO2 LLC. licenses this file to you under the Apache License,
+//  Version 2.0 (the "License"); you may not use this file except
+//  in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0-devel
diff --git a/adapter/pkg/discovery/api/wso2/discovery/subscription/url_mapping.pb.go b/adapter/pkg/discovery/api/wso2/discovery/subscription/url_mapping.pb.go
deleted file mode 100644
index 8de98b068..000000000
--- a/adapter/pkg/discovery/api/wso2/discovery/subscription/url_mapping.pb.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.13.0
-// source: wso2/discovery/subscription/url_mapping.proto
-
-package subscription
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// URLMapping data model
-type URLMapping struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AuthScheme string   `protobuf:"bytes,1,opt,name=authScheme,proto3" json:"authScheme,omitempty"`
-	HttpMethod string   `protobuf:"bytes,2,opt,name=httpMethod,proto3" json:"httpMethod,omitempty"`
-	UrlPattern string   `protobuf:"bytes,3,opt,name=urlPattern,proto3" json:"urlPattern,omitempty"`
-	Scopes     []string `protobuf:"bytes,4,rep,name=scopes,proto3" json:"scopes,omitempty"`
-}
-
-func (x *URLMapping) Reset() {
-	*x = URLMapping{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wso2_discovery_subscription_url_mapping_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *URLMapping) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*URLMapping) ProtoMessage() {}
-
-func (x *URLMapping) ProtoReflect() protoreflect.Message {
-	mi := &file_wso2_discovery_subscription_url_mapping_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use URLMapping.ProtoReflect.Descriptor instead.
-func (*URLMapping) Descriptor() ([]byte, []int) {
-	return file_wso2_discovery_subscription_url_mapping_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *URLMapping) GetAuthScheme() string {
-	if x != nil {
-		return x.AuthScheme
-	}
-	return ""
-}
-
-func (x *URLMapping) GetHttpMethod() string {
-	if x != nil {
-		return x.HttpMethod
-	}
-	return ""
-}
-
-func (x *URLMapping) GetUrlPattern() string {
-	if x != nil {
-		return x.UrlPattern
-	}
-	return ""
-}
-
-func (x *URLMapping) GetScopes() []string {
-	if x != nil {
-		return x.Scopes
-	}
-	return nil
-}
-
-var File_wso2_discovery_subscription_url_mapping_proto protoreflect.FileDescriptor
-
-var file_wso2_discovery_subscription_url_mapping_proto_rawDesc = []byte{
-	0x0a, 0x2d, 0x77, 0x73, 0x6f, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
-	0x2f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x75, 0x72,
-	0x6c, 0x5f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x1b, 0x77, 0x73, 0x6f, 0x32, 0x2e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e,
-	0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a,
-	0x0a, 0x55, 0x52, 0x4c, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x61,
-	0x75, 0x74, 0x68, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x61, 0x75, 0x74, 0x68, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x68,
-	0x74, 0x74, 0x70, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x68, 0x74, 0x74, 0x70, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x75,
-	0x72, 0x6c, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x75, 0x72, 0x6c, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73,
-	0x63, 0x6f, 0x70, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x73, 0x63, 0x6f,
-	0x70, 0x65, 0x73, 0x42, 0x92, 0x01, 0x0a, 0x2c, 0x6f, 0x72, 0x67, 0x2e, 0x77, 0x73, 0x6f, 0x32,
-	0x2e, 0x61, 0x70, 0x6b, 0x2e, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x72, 0x2e, 0x64, 0x69,
-	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x55, 0x52, 0x4c, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
-	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
-	0x77, 0x73, 0x6f, 0x32, 0x2f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2f, 0x73,
-	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x73, 0x75, 0x62, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_wso2_discovery_subscription_url_mapping_proto_rawDescOnce sync.Once
-	file_wso2_discovery_subscription_url_mapping_proto_rawDescData = file_wso2_discovery_subscription_url_mapping_proto_rawDesc
-)
-
-func file_wso2_discovery_subscription_url_mapping_proto_rawDescGZIP() []byte {
-	file_wso2_discovery_subscription_url_mapping_proto_rawDescOnce.Do(func() {
-		file_wso2_discovery_subscription_url_mapping_proto_rawDescData = protoimpl.X.CompressGZIP(file_wso2_discovery_subscription_url_mapping_proto_rawDescData)
-	})
-	return file_wso2_discovery_subscription_url_mapping_proto_rawDescData
-}
-
-var file_wso2_discovery_subscription_url_mapping_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_wso2_discovery_subscription_url_mapping_proto_goTypes = []interface{}{
-	(*URLMapping)(nil), // 0: wso2.discovery.subscription.URLMapping
-}
-var file_wso2_discovery_subscription_url_mapping_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_wso2_discovery_subscription_url_mapping_proto_init() }
-func file_wso2_discovery_subscription_url_mapping_proto_init() {
-	if File_wso2_discovery_subscription_url_mapping_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_wso2_discovery_subscription_url_mapping_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*URLMapping); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_wso2_discovery_subscription_url_mapping_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_wso2_discovery_subscription_url_mapping_proto_goTypes,
-		DependencyIndexes: file_wso2_discovery_subscription_url_mapping_proto_depIdxs,
-		MessageInfos:      file_wso2_discovery_subscription_url_mapping_proto_msgTypes,
-	}.Build()
-	File_wso2_discovery_subscription_url_mapping_proto = out.File
-	file_wso2_discovery_subscription_url_mapping_proto_rawDesc = nil
-	file_wso2_discovery_subscription_url_mapping_proto_goTypes = nil
-	file_wso2_discovery_subscription_url_mapping_proto_depIdxs = nil
-}
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/service/apkmgt/EventServiceProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/service/apkmgt/EventServiceProto.java
index 2ebf3bdcc..8125f757a 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/service/apkmgt/EventServiceProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/service/apkmgt/EventServiceProto.java
@@ -34,11 +34,11 @@ public static void registerAllExtensions(
       "est\022\r\n\005event\030\001 \001(\t2o\n\022EventStreamService" +
       "\022Y\n\014StreamEvents\022!.discovery.service.apk" +
       "mgt.Request\032\".wso2.discovery.subscriptio" +
-      "n.Event\"\0000\001B\225\001\n.org.wso2.apk.enforcer.di" +
+      "n.Event\"\0000\001B\234\001\n.org.wso2.apk.enforcer.di" +
       "scovery.service.apkmgtB\021EventServiceProt" +
-      "oP\001ZKgithub.com/wso2/apk/adapter/pkg/dis" +
-      "covery/api/wso2/discovery/service/apkmgt" +
-      "\210\001\001b\006proto3"
+      "oP\001ZRgithub.com/wso2/apk/common-go-libs/" +
+      "pkg/discovery/api/wso2/discovery/service" +
+      "/apkmgt\210\001\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationKeyMappingProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationKeyMappingProto.java
index db027867b..3091c2736 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationKeyMappingProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationKeyMappingProto.java
@@ -34,11 +34,11 @@ public static void registerAllExtensions(
       "plicationUUID\030\001 \001(\t\022\026\n\016securityScheme\030\002 " +
       "\001(\t\022\035\n\025applicationIdentifier\030\003 \001(\t\022\017\n\007ke" +
       "yType\030\004 \001(\t\022\r\n\005envID\030\005 \001(\t\022\021\n\ttimestamp\030" +
-      "\006 \001(\003\022\024\n\014organization\030\007 \001(\tB\227\001\n,org.wso2" +
+      "\006 \001(\003\022\024\n\014organization\030\007 \001(\tB\236\001\n,org.wso2" +
       ".apk.enforcer.discovery.subscriptionB\032Ap" +
-      "plicationKeyMappingProtoP\001ZIgithub.com/w" +
-      "so2/apk/adapter/pkg/discovery/api/wso2/d" +
-      "iscovery/subscriptionb\006proto3"
+      "plicationKeyMappingProtoP\001ZPgithub.com/w" +
+      "so2/apk/common-go-libs/pkg/discovery/api" +
+      "/wso2/discovery/subscriptionb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationMappingProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationMappingProto.java
index db924973b..616284188 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationMappingProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationMappingProto.java
@@ -32,11 +32,11 @@ public static void registerAllExtensions(
       "nmapping.proto\022\033wso2.discovery.subscript" +
       "ion\"i\n\022ApplicationMapping\022\014\n\004uuid\030\001 \001(\t\022" +
       "\026\n\016applicationRef\030\002 \001(\t\022\027\n\017subscriptionR" +
-      "ef\030\003 \001(\t\022\024\n\014organization\030\004 \001(\tB\224\001\n,org.w" +
+      "ef\030\003 \001(\t\022\024\n\014organization\030\004 \001(\tB\233\001\n,org.w" +
       "so2.apk.enforcer.discovery.subscriptionB" +
-      "\027ApplicationMappingProtoP\001ZIgithub.com/w" +
-      "so2/apk/adapter/pkg/discovery/api/wso2/d" +
-      "iscovery/subscriptionb\006proto3"
+      "\027ApplicationMappingProtoP\001ZPgithub.com/w" +
+      "so2/apk/common-go-libs/pkg/discovery/api" +
+      "/wso2/discovery/subscriptionb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationProto.java
index 49d0be32a..bfcf136f5 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/ApplicationProto.java
@@ -40,10 +40,11 @@ public static void registerAllExtensions(
       "\nattributes\030\005 \003(\01328.wso2.discovery.subsc" +
       "ription.Application.AttributesEntry\0321\n\017A" +
       "ttributesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" +
-      "(\t:\0028\001B\215\001\n,org.wso2.apk.enforcer.discove" +
-      "ry.subscriptionB\020ApplicationProtoP\001ZIgit" +
-      "hub.com/wso2/apk/adapter/pkg/discovery/a" +
-      "pi/wso2/discovery/subscriptionb\006proto3"
+      "(\t:\0028\001B\224\001\n,org.wso2.apk.enforcer.discove" +
+      "ry.subscriptionB\020ApplicationProtoP\001ZPgit" +
+      "hub.com/wso2/apk/common-go-libs/pkg/disc" +
+      "overy/api/wso2/discovery/subscriptionb\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/EventProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/EventProto.java
index 7c794cb2e..ddf36b01e 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/EventProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/EventProto.java
@@ -43,11 +43,11 @@ public static void registerAllExtensions(
       "pplicationKeyMapping\030\006 \001(\01322.wso2.discov" +
       "ery.subscription.ApplicationKeyMapping\022?" +
       "\n\014subscription\030\007 \001(\0132).wso2.discovery.su" +
-      "bscription.SubscriptionB\207\001\n,org.wso2.apk" +
+      "bscription.SubscriptionB\216\001\n,org.wso2.apk" +
       ".enforcer.discovery.subscriptionB\nEventP" +
-      "rotoP\001ZIgithub.com/wso2/apk/adapter/pkg/" +
-      "discovery/api/wso2/discovery/subscriptio" +
-      "nb\006proto3"
+      "rotoP\001ZPgithub.com/wso2/apk/common-go-li" +
+      "bs/pkg/discovery/api/wso2/discovery/subs" +
+      "criptionb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/SubscriptionProto.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/SubscriptionProto.java
index d8fe93be3..14e8baa70 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/SubscriptionProto.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/discovery/subscription/SubscriptionProto.java
@@ -39,11 +39,11 @@ public static void registerAllExtensions(
       "d\030\002 \001(\t\022\024\n\014organization\030\003 \001(\t\022A\n\rsubscri" +
       "bedApi\030\004 \001(\0132*.wso2.discovery.subscripti" +
       "on.SubscribedAPI\".\n\rSubscribedAPI\022\014\n\004nam" +
-      "e\030\001 \001(\t\022\017\n\007version\030\002 \001(\tB\216\001\n,org.wso2.ap" +
+      "e\030\001 \001(\t\022\017\n\007version\030\002 \001(\tB\225\001\n,org.wso2.ap" +
       "k.enforcer.discovery.subscriptionB\021Subsc" +
-      "riptionProtoP\001ZIgithub.com/wso2/apk/adap" +
-      "ter/pkg/discovery/api/wso2/discovery/sub" +
-      "scriptionb\006proto3"
+      "riptionProtoP\001ZPgithub.com/wso2/apk/comm" +
+      "on-go-libs/pkg/discovery/api/wso2/discov" +
+      "ery/subscriptionb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,