diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 5c616c535dd52d..077b01e51c37bf 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -873,6 +873,7 @@ MCORE.DD.FETCH_DCL=1
 #Ethernet Network Diagnostics Cluster
 DGETH.S.C00.Rsp=1
 DGETH.C.C00.Tx=1
+#Server
 DGETH.S.A0000=1
 DGETH.S.A0001=1
 DGETH.S.A0002=1
@@ -882,6 +883,16 @@ DGETH.S.A0005=1
 DGETH.S.A0006=1
 DGETH.S.A0007=1
 DGETH.S.A0008=1
+#client
+DGETH.C.A0000=1
+DGETH.C.A0001=1
+DGETH.C.A0002=1
+DGETH.C.A0003=1
+DGETH.C.A0004=1
+DGETH.C.A0005=1
+DGETH.C.A0006=1
+DGETH.C.A0007=1
+DGETH.C.A0008=1
 #Features
 DGETH.S.F00=0
 DGETH.S.F01=1
@@ -889,6 +900,7 @@ DGETH.S.F01=1
 #Wi-Fi Network Diagnostics Cluster
 DGWIFI.S.F00=1
 DGWIFI.S.F01=1
+#Server
 DGWIFI.S.A0000=1
 DGWIFI.S.A0001=1
 DGWIFI.S.A0002=1
@@ -902,10 +914,26 @@ DGWIFI.S.A0009=1
 DGWIFI.S.A000a=1
 DGWIFI.S.A000b=1
 DGWIFI.S.A000c=1
+#client
+DGWIFI.C.A0000=1
+DGWIFI.C.A0001=1
+DGWIFI.C.A0002=1
+DGWIFI.C.A0003=1
+DGWIFI.C.A0004=1
+DGWIFI.C.A0005=1
+DGWIFI.C.A0006=1
+DGWIFI.C.A0007=1
+DGWIFI.C.A0008=1
+DGWIFI.C.A0009=1
+DGWIFI.C.A000a=1
+DGWIFI.C.A000b=1
+DGWIFI.C.A000c=1
+#Events
 DGWIFI.S.E00=1
 DGWIFI.S.E01=1
 DGWIFI.S.E02=1
 DGWIFI.S.C00.Rsp=1
+
 #On/Off Cluster
 OO.S.A0000=1
 OO.S.A4000=1