diff --git a/static/ngf/img/src/advanced-routing.mermaid b/static/ngf/img/src/advanced-routing.mermaid
index dda2c7888..8d7d83b8a 100644
--- a/static/ngf/img/src/advanced-routing.mermaid
+++ b/static/ngf/img/src/advanced-routing.mermaid
@@ -3,15 +3,9 @@ graph LR
     users[Users]
     ngfSvc["Public Endpoint\nfor\ncafe.example.com"]
     subgraph cluster [Kubernetes Cluster]
-        subgraph clusterPadding [" "]
-            subgraph clusterPadding2 [" "]
-                subgraph gwNS [Namespace\nnginx-gateway]
-                    ngfPod[Pod\nnginx-gateway]
-                end
-            end
-        end
         subgraph appNs [Namespace\ndefault]
             subgraph nsPadding [" "]
+                nginxPod[Pod\nNGINX]
                 coffeeV1Pod[Pod\ncoffee v1]
                 coffeeV2Pod[Pod\ncoffee v2]
                 teaPod[Pod\ntea]
@@ -19,17 +13,20 @@ graph LR
             end
         end
     end
-  ngfSvc --> ngfPod
-  ngfPod --/coffee--> coffeeV1Pod
-  ngfPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
-  ngfPod --GET /tea--> teaPod
-  ngfPod --POST /tea--> teaPostPod
+
+  ngfSvc --> nginxPod
+  nginxPod --/coffee--> coffeeV1Pod
+  nginxPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
+  nginxPod --GET /tea--> teaPod
+  nginxPod --POST /tea--> teaPostPod
   users --> ngfSvc
+
   class clusterPadding,nsPadding,clusterPadding2 noBorder
   class gwNS,appNs namespace
-  class ngfSvc,ngfPod nginxNode
+  class ngfSvc,nginxPod nginxNode
   class coffeeV1Pod,coffeeV2Pod coffeeNode
   class teaPod,teaPostPod teaNode
+
   classDef noBorder stroke:none,fill:none
   classDef default fill:#FFFFFF,stroke:#000000
   classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center
diff --git a/static/ngf/img/src/route-all-traffic-flow.mermaid b/static/ngf/img/src/route-all-traffic-flow.mermaid
index f53d35ae5..ed310024f 100644
--- a/static/ngf/img/src/route-all-traffic-flow.mermaid
+++ b/static/ngf/img/src/route-all-traffic-flow.mermaid
@@ -5,35 +5,26 @@ graph LR
 
     subgraph cluster [Kubernetes Cluster]
         style cluster fill:#FFFFFF,stroke:#000000
-        subgraph clusterPadding [" "]
-            subgraph clusterPadding2 [" "]
-                subgraph gwNS [Namespace\nnginx-gateway]
-                    ngfPod[Pod\nnginx-gateway]
-                end
-            end
-        end
 
         subgraph appNs [Namespace\ndefault]
             subgraph nsPadding [" "]
+            nginxPod[Pod\nNGINX]
                 coffeePod1[Pod\ncoffee]
                 coffeePod2[Pod\ncoffee]
             end
         end
     end
 
-
-
-  ngfSvc --> ngfPod
-  ngfPod --> coffeePod1 & coffeePod2
+  ngfSvc --> nginxPod
+  nginxPod --> coffeePod1 & coffeePod2
   clients --> ngfSvc
 
   class clusterPadding,nsPadding,clusterPadding2 noBorder
   class gwNS,appNs namespace
-  class ngfPod,ngfSvc nginxNode
+  class nginxPod,ngfSvc nginxNode
   class coffeePod1,coffeePod2 coffeeNode
   class clients clientNode
 
-
   classDef noBorder stroke:none,fill:none
   classDef default fill:#FFFFFF,stroke:#000000
   classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center