diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index e4a61fa2c5..7d8c9f2465 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -137,6 +137,7 @@
         "empty_message_text": "No gateways to display.",
 
         "edit": {
+            "name": "Name",
             "backend": "Backend",
             "backend_description": "Select a backend",
             "region": "Region",
diff --git a/frontend/src/pages/Project/Details/Settings/index.tsx b/frontend/src/pages/Project/Details/Settings/index.tsx
index e93b513181..8e61522bbd 100644
--- a/frontend/src/pages/Project/Details/Settings/index.tsx
+++ b/frontend/src/pages/Project/Details/Settings/index.tsx
@@ -460,7 +460,7 @@ export const ProjectSettings: React.FC = () => {
                             : {})}
                     />
 
-                    <GatewaysTable gateways={gatewaysData} />
+                    <GatewaysTable gateways={gatewaysData} projectName={paramProjectName} />
 
                     <ProjectMembers
                         onChange={debouncedMembersHandler}
diff --git a/frontend/src/pages/Project/Gateways/Table/hooks/useColumnsDefinitions.tsx b/frontend/src/pages/Project/Gateways/Table/hooks/useColumnsDefinitions.tsx
index b0dca1242e..79b4aac22c 100644
--- a/frontend/src/pages/Project/Gateways/Table/hooks/useColumnsDefinitions.tsx
+++ b/frontend/src/pages/Project/Gateways/Table/hooks/useColumnsDefinitions.tsx
@@ -8,15 +8,25 @@ import styles from '../styles.module.scss';
 
 type hookArgs = {
     loading?: boolean;
+    projectName: string;
     onDeleteClick?: (gateway: IGateway) => void;
     onEditClick?: (gateway: IGateway) => void;
 };
 
-export const useColumnsDefinitions = ({ loading, onDeleteClick, onEditClick }: hookArgs) => {
+export const useColumnsDefinitions = ({ loading, projectName, onDeleteClick, onEditClick }: hookArgs) => {
     const { t } = useTranslation();
 
     const columns = useMemo(() => {
         return [
+            {
+                id: 'name',
+                header: t('gateway.edit.name'),
+                cell: (gateway: IGateway) =>
+                    gateway.project_name && gateway.project_name !== projectName
+                        ? `${gateway.project_name}/${gateway.name}`
+                        : gateway.name,
+            },
+
             {
                 id: 'type',
                 header: t('gateway.edit.backend'),
@@ -76,7 +86,7 @@ export const useColumnsDefinitions = ({ loading, onDeleteClick, onEditClick }: h
                 ),
             },
         ];
-    }, [loading, onEditClick, onDeleteClick]);
+    }, [loading, projectName, onEditClick, onDeleteClick]);
 
     return { columns } as const;
 };
diff --git a/frontend/src/pages/Project/Gateways/Table/index.tsx b/frontend/src/pages/Project/Gateways/Table/index.tsx
index a504d6cf58..16e852ee12 100644
--- a/frontend/src/pages/Project/Gateways/Table/index.tsx
+++ b/frontend/src/pages/Project/Gateways/Table/index.tsx
@@ -10,7 +10,7 @@ import { useColumnsDefinitions } from './hooks';
 
 import { IProps } from './types';
 
-export const GatewaysTable: React.FC<IProps> = ({ gateways, addItem, deleteItem, editItem, isDisabledDelete }) => {
+export const GatewaysTable: React.FC<IProps> = ({ gateways, projectName, addItem, deleteItem, editItem, isDisabledDelete }) => {
     const { t } = useTranslation();
     const [openHelpPanel] = useHelpPanel();
 
@@ -41,6 +41,7 @@ export const GatewaysTable: React.FC<IProps> = ({ gateways, addItem, deleteItem,
     };
 
     const { columns } = useColumnsDefinitions({
+        projectName,
         ...(editItem ? { onEditClick: (gateway) => editItem(gateway) } : {}),
         ...(deleteItem ? { onDeleteClick: (gateway) => deleteItem([gateway]) } : {}),
     });
diff --git a/frontend/src/pages/Project/Gateways/Table/types.ts b/frontend/src/pages/Project/Gateways/Table/types.ts
index a8624f8bd5..9a7cdda312 100644
--- a/frontend/src/pages/Project/Gateways/Table/types.ts
+++ b/frontend/src/pages/Project/Gateways/Table/types.ts
@@ -1,5 +1,6 @@
 export interface IProps {
     gateways: IGateway[];
+    projectName: string;
     addItem?: () => void;
     deleteItem?: (gateways: readonly IGateway[] | IGateway[]) => void;
     editItem?: (gateways: IGateway) => void;
diff --git a/frontend/src/pages/Project/Gateways/hooks/useGatewaysTable.ts b/frontend/src/pages/Project/Gateways/hooks/useGatewaysTable.ts
index c1c51bfa72..efbf278e81 100644
--- a/frontend/src/pages/Project/Gateways/hooks/useGatewaysTable.ts
+++ b/frontend/src/pages/Project/Gateways/hooks/useGatewaysTable.ts
@@ -8,6 +8,8 @@ export const useGatewaysTable = (projectName: IProject['project_name']) => {
     const { data, isLoading } = useGetProjectGatewaysQuery({ projectName });
     const [deleteGatewayRequest, { isLoading: isDeleting }] = useDeleteProjectGatewayMutation();
 
+    // NOTE: editing and deletion are disabled as of 0.20.21.
+    // If enabling, ensure that imported gateways cannot be edited or deleted.
     const editGateway = (gateway: IGateway) => {
         navigate(ROUTES.PROJECT.GATEWAY.EDIT.FORMAT(projectName, gateway.name));
     };
diff --git a/frontend/src/services/gateway.ts b/frontend/src/services/gateway.ts
index bca3950fc0..07e184b91e 100644
--- a/frontend/src/services/gateway.ts
+++ b/frontend/src/services/gateway.ts
@@ -17,6 +17,7 @@ export const gatewayApi = createApi({
             query: ({ projectName }) => ({
                 url: API.PROJECT_GATEWAYS.LIST(projectName),
                 method: 'POST',
+                body: { include_imported: true },
             }),
 
             providesTags: (result) =>
diff --git a/frontend/src/types/gateway.d.ts b/frontend/src/types/gateway.d.ts
index 7e8b5e52f4..4ef2eeeb54 100644
--- a/frontend/src/types/gateway.d.ts
+++ b/frontend/src/types/gateway.d.ts
@@ -1,6 +1,7 @@
 declare interface IGateway {
     backend: string,
     name: string,
+    project_name?: string,
     ip_address: string,
     instance_id: string,
     region:string