diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
old mode 100644
new mode 100755
index f0b2885f0..29b49060d
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
@@ -25,9 +25,9 @@ import { buildGatewayEndpoint } from './applicationApiGateways.util'
 import {
   API_GATEWAY_STATE_CLASS,
   API_GATEWAY_STATE_LABEL,
-  FORCE_SSL_REDIRECT_ANNOTATION,
-  NUCLIO_OWNER_LABEL
+  FORCE_SSL_REDIRECT_ANNOTATION
 } from '../applicationDetails.constants'
+import { buildNuclioOwner } from '../../../../../utils/nuclioEnrichment.util'
 
 export const apiGatewaysColumns = [
   {
@@ -136,11 +136,7 @@ export const apiGatewaysColumns = [
     id: 'owner',
     header: 'Owner',
     size: 10,
-    accessorFn: row => row.metadata?.labels?.[NUCLIO_OWNER_LABEL] ?? '',
-    cell: ({ row }) => (
-      <span className="text-igz-secondary">
-        {row.original.metadata?.labels?.[NUCLIO_OWNER_LABEL] || ''}
-      </span>
-    )
+    accessorFn: ({ metadata }) => buildNuclioOwner(metadata?.labels),
+    cell: ({ getValue }) => <span className="text-igz-secondary">{getValue()}</span>
   }
 ]
diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/applicationApiGateways.util.js b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/applicationApiGateways.util.js
index 2b68b53bf..3417e12da 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/applicationApiGateways.util.js
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/applicationApiGateways.util.js
@@ -17,7 +17,7 @@ illegal under applicable law, and the grant of the foregoing license
 under the Apache 2.0 license is conditioned upon your compliance with
 such restriction.
 */
-import { NUCLIO_OWNER_LABEL } from '../applicationDetails.constants'
+import { buildNuclioOwner } from '../../../../../utils/nuclioEnrichment.util'
 
 export {
   buildGatewayEndpoint,
@@ -39,7 +39,7 @@ export const filterApiGatewaysBySearchFields = (gateways, filters) => {
 
     if (
       ownerFilter &&
-      !gateway.metadata?.labels?.[NUCLIO_OWNER_LABEL]?.toLowerCase().includes(ownerFilter)
+      !buildNuclioOwner(gateway.metadata?.labels).toLowerCase().includes(ownerFilter)
     ) {
       return false
     }
diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
old mode 100644
new mode 100755
index c8c1fd58b..a19e94822
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
@@ -94,8 +94,6 @@ export const API_GATEWAY_STATE_CLASS = {
 
 export { GATEWAY_RELATIONSHIP } from '../../../../utils/apiGateway.util'
 
-export const NUCLIO_OWNER_LABEL = 'iguazio.com/username'
-
 export const FORCE_SSL_REDIRECT_ANNOTATION = 'nginx.ingress.kubernetes.io/force-ssl-redirect'
 
 export const API_GATEWAYS_FILTER_CONFIG = {
diff --git a/src/utils/nuclioEnrichment.util.js b/src/utils/nuclioEnrichment.util.js
index c5df47d0b..34f52d947 100644
--- a/src/utils/nuclioEnrichment.util.js
+++ b/src/utils/nuclioEnrichment.util.js
@@ -30,9 +30,16 @@ import {
   FUNCTIONS_PAGE,
   UNHEALTHY_STATE
 } from '../constants'
-
 const NUCLIO_FUNCTIONS_STATE_KIND = 'nuclioFunctions'
-const NUCLIO_OWNER_LABEL = 'iguazio.com/username'
+const NUCLIO_USERNAME_LABEL = 'iguazio.com/username'
+const NUCLIO_DOMAIN_LABEL = 'iguazio.com/domain'
+
+export const buildNuclioOwner = labels => {
+  const username = labels?.[NUCLIO_USERNAME_LABEL]
+  const domain = labels?.[NUCLIO_DOMAIN_LABEL]
+
+  return domain ? `${username}@${domain}` : (username ?? '')
+}
 
 const buildEndpointsCountMap = modelEndpoints => {
   const countMap = {}
@@ -67,7 +74,7 @@ export const enrichFunctionsWithNuclio = (
       : ''
 
     const state = nuclioFuncState || func.state?.value || ''
-    const owner = nuclioFunc?.metadata?.labels?.[NUCLIO_OWNER_LABEL] ?? ''
+    const owner = buildNuclioOwner(nuclioFunc?.metadata?.labels)
 
     const applicationGateways = filterGatewaysByFunction(
       projectApiGateways,