diff --git a/ee/api/chalicelib/core/webhook.py b/ee/api/chalicelib/core/webhook.py
index 6cc20a7c8..6f9b752db 100644
--- a/ee/api/chalicelib/core/webhook.py
+++ b/ee/api/chalicelib/core/webhook.py
@@ -21,14 +21,14 @@ def get_by_id(webhook_id):
         return w
 
 
-def get(tenant_id, webhook_id):
+def get_webhook(tenant_id, webhook_id, webhook_type='webhook'):
     with pg_client.PostgresClient() as cur:
         cur.execute(
-            cur.mogrify("""\
-                    SELECT w.*
-                    FROM public.webhooks AS w 
-                    WHERE w.webhook_id =%(webhook_id)s AND w.tenant_id =%(tenant_id)s AND deleted_at ISNULL AND type='webhook';""",
-                        {"webhook_id": webhook_id, "tenant_id": tenant_id})
+            cur.mogrify("""SELECT w.*
+                            FROM public.webhooks AS w 
+                            WHERE w.webhook_id =%(webhook_id)s AND w.tenant_id =%(tenant_id)s 
+                                 AND deleted_at ISNULL AND type=%(webhook_type)s;""",
+                        {"webhook_id": webhook_id, "webhook_type": webhook_type, "tenant_id": tenant_id})
         )
         w = helper.dict_to_camel_case(cur.fetchone())
         if w:
@@ -39,9 +39,7 @@ def get(tenant_id, webhook_id):
 def get_by_type(tenant_id, webhook_type):
     with pg_client.PostgresClient() as cur:
         cur.execute(
-            cur.mogrify("""\
-                    SELECT
-                           w.webhook_id AS integration_id, w.webhook_id AS id,w.webhook_id,w.endpoint,w.auth_header,w.type,w.index,w.name,w.created_at
+            cur.mogrify("""SELECT w.webhook_id,w.webhook_id,w.endpoint,w.auth_header,w.type,w.index,w.name,w.created_at
                     FROM public.webhooks AS w 
                     WHERE w.tenant_id =%(tenant_id)s 
                         AND w.type =%(type)s 
@@ -79,7 +77,7 @@ def update(tenant_id, webhook_id, changes, replace_none=False):
                     UPDATE public.webhooks
                     SET {','.join(sub_query)}
                     WHERE tenant_id =%(tenant_id)s AND webhook_id =%(id)s AND deleted_at ISNULL
-                    RETURNING webhook_id AS integration_id, webhook_id AS id,*;""",
+                    RETURNING *;""",
                         {"tenant_id": tenant_id, "id": webhook_id, **changes})
         )
         w = helper.dict_to_camel_case(cur.fetchone())
@@ -96,7 +94,7 @@ def add(tenant_id, endpoint, auth_header=None, webhook_type='webhook', name="",
         query = cur.mogrify("""\
                     INSERT INTO public.webhooks(tenant_id, endpoint,auth_header,type,name)
                     VALUES (%(tenant_id)s, %(endpoint)s, %(auth_header)s, %(type)s,%(name)s)
-                    RETURNING webhook_id AS integration_id, webhook_id AS id,*;""",
+                    RETURNING *;""",
                             {"tenant_id": tenant_id, "endpoint": endpoint, "auth_header": auth_header,
                              "type": webhook_type, "name": name})
         cur.execute(