diff --git a/cilium-values-virt.yaml b/cilium-values-virt.yaml
index 0ad1420..3428b0e 100644
--- a/cilium-values-virt.yaml
+++ b/cilium-values-virt.yaml
@@ -29,7 +29,9 @@ cgroup:
 ipam:
   mode: kubernetes
 
-devices: [ eth0, br0 ]
+# Devices are used to masquade traffic originating from these interfaces
+# used with egressgateway
+devices: [ eth0, br0, br99-wifi, br1100-testlan ]
 operator:
   rollOutPods: true
   resources:
@@ -112,9 +114,6 @@ hubble:
   ui:
     enabled: true
     rollOutPods: true
-  metrics:
-    dynamic:
-      enabled: true
 
 prometheus:
   metricsService: true
diff --git a/cilium-values.yaml b/cilium-values.yaml
index ed285c9..a9fb7e5 100644
--- a/cilium-values.yaml
+++ b/cilium-values.yaml
@@ -19,10 +19,11 @@ securityContext:
 
 bpf:
   vlanBypass: [ 0 ]
-  masquade: true
+#  masquade: true # We don't need egressGateway for now
 
-egressGateway:
-  enabled: true
+# We don't need egressGateway for now. 
+# egressGateway:
+#   enabled: true
 
 cgroup:
   autoMount:
@@ -72,8 +73,6 @@ resources:
 externalIPs:
   enabled: true
 
-enableCiliumEndpointSlice: false
-
 ipv6:
   enabled: true