diff --git a/keep-ui/app/topology/model/models.ts b/keep-ui/app/topology/model/models.ts
index 23308640c..2d4c75a32 100644
--- a/keep-ui/app/topology/model/models.ts
+++ b/keep-ui/app/topology/model/models.ts
@@ -22,6 +22,7 @@ export interface TopologyService {
   ip_address?: string;
   mac_address?: string;
   manufacturer?: string;
+  category?: string;
   application_ids: string[];
   // Added on client to optimize rendering
   applications: TopologyApplicationMinimal[];
diff --git a/keep-ui/app/topology/ui/map/service-node.tsx b/keep-ui/app/topology/ui/map/service-node.tsx
index a15c7e3c7..b4e43b54a 100644
--- a/keep-ui/app/topology/ui/map/service-node.tsx
+++ b/keep-ui/app/topology/ui/map/service-node.tsx
@@ -7,6 +7,7 @@ import { ServiceNodeType, TopologyService } from "../../model/models";
 import { Badge } from "@tremor/react";
 import { getColorForUUID } from "@/app/topology/lib/badge-colors";
 import { clsx } from "clsx";
+import Image from "next/image";
 
 const THRESHOLD = 5;
 
@@ -107,6 +108,18 @@ export function ServiceNode({ data, selected }: NodeProps<ServiceNodeType>) {
         onMouseEnter={() => setShowDetails(true)}
         onMouseLeave={() => setShowDetails(false)}
       >
+        {data.category && (
+          <div className="absolute top-2 right-2 text-gray-400">
+            <Image
+              className="inline-block"
+              alt={data.category}
+              height={24}
+              width={24}
+              title={data.category}
+              src={`/icons/${data.category.toLowerCase()}-icon.png`}
+            />
+          </div>
+        )}
         <strong className="text-lg">{data.display_name || data.service}</strong>
         {alertCount > 0 && (
           <span
diff --git a/keep-ui/public/icons/go-icon.png b/keep-ui/public/icons/go-icon.png
new file mode 100644
index 000000000..d6d98c3bd
Binary files /dev/null and b/keep-ui/public/icons/go-icon.png differ
diff --git a/keep-ui/public/icons/nextjs-icon.png b/keep-ui/public/icons/nextjs-icon.png
new file mode 100644
index 000000000..285982a0c
Binary files /dev/null and b/keep-ui/public/icons/nextjs-icon.png differ
diff --git a/keep/api/utils/tenant_utils.py b/keep/api/utils/tenant_utils.py
index 32c869139..851f28f88 100644
--- a/keep/api/utils/tenant_utils.py
+++ b/keep/api/utils/tenant_utils.py
@@ -5,6 +5,7 @@
 
 from sqlmodel import Session, select
 
+from keep.api.core.config import config
 from keep.api.models.db.tenant import TenantApiKey
 from keep.contextmanager.contextmanager import ContextManager
 from keep.identitymanager.rbac import Admin as AdminRole
@@ -218,6 +219,11 @@ def get_api_keys_secret(
                 f"{api_key.tenant_id}-{api_key.reference_id}"
             )
 
+            read_only_bypass_key = config("KEEP_READ_ONLY_BYPASS_KEY", default="")
+            if read_only_bypass_key and read_only_bypass_key == secret:
+                # Do not return the bypass key if set.
+                continue
+
             api_keys_with_secret.append(
                 {
                     "reference_id": api_key.reference_id,