diff --git a/examples/cdn/cdn-server.yaml b/examples/cdn/cdn-server.yaml
index b4f21fd8280a4b8dceb7bbfcae8750e93a15c7d5..9484d362927d49e27ac20c40cddb3d3416282682 100644
--- a/examples/cdn/cdn-server.yaml
+++ b/examples/cdn/cdn-server.yaml
@@ -5,11 +5,11 @@ metadata:
   labels:
     app: test4
   annotations:
-    k8s.v1.cni.cncf.io/networks: v-network-1
+    l2sm/networks: '[{"name": "v-network-1", "ips":["192.168.1.8/24"]}]'
 spec:
   containers:
   - name: server
-    command: ["/bin/ash", "-c", "ip a add 10.0.1.2/24 dev net1 && ip route add 10.0.2.0/24 via 10.0.1.1 dev net1 && trap : TERM INT; sleep infinity & wait"]
+    command: ["/bin/ash", "-c", "sleep infinity & wait"]
     image: alpine:latest
     securityContext:
       capabilities:
diff --git a/examples/cdn/v-network-1.yaml b/examples/cdn/v-network-1.yaml
index b5eb87ed07363461b133b9d98a080f7abaac4d49..102e9be924db0ac24861ea9feb647b482968f3c5 100644
--- a/examples/cdn/v-network-1.yaml
+++ b/examples/cdn/v-network-1.yaml
@@ -1,11 +1,6 @@
-apiVersion: "k8s.cni.cncf.io/v1"
-kind: NetworkAttachmentDefinition
+apiVersion: l2sm.l2sm.k8s.local/v1
+kind: L2SMNetwork
 metadata:
   name: v-network-1
 spec:
-  config: '{
-      "cniVersion": "0.3.0",
-      "type": "l2sm",
-      "device": "l2sm-vNet"
-    }'
-
+  type: vnet
\ No newline at end of file
diff --git a/examples/inter-cluster/example-ned.yaml b/examples/inter-cluster/example-ned.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..01db618640db9d42f44facbd541387840ea02bf2
--- /dev/null
+++ b/examples/inter-cluster/example-ned.yaml
@@ -0,0 +1,26 @@
+apiVersion: l2sm.l2sm.k8s.local/v1
+kind: NetworkEdgeDevice
+metadata:
+  name: example-networkedgedevice
+  labels:
+    app: l2sm
+spec:
+  networkController:
+    name: example-network-controller
+    domain: controller.example.com
+  neighbors:
+    - node: l2sm-test-5
+      domain: 10.0.0.2
+  switchTemplate:
+    spec:
+      hostNetwork: true
+      containers:
+        - name: l2sm-switch
+          image: alexdecb/l2sm-switch:2.4
+          #args: ["setup_ned.sh && sleep infinity"]
+          env:
+          - name: CONTROLLERIP
+            value: "l2sm-controller-service"
+          securityContext:
+              capabilities:
+                add: ["NET_ADMIN"]
diff --git a/examples/inter-cluster/inter-network.yaml b/examples/inter-cluster/inter-network.yaml
index 654b7fa35ef48217b3fc5f0821d52938e7d48bf9..cddc763ac50dc76ff7d5c159f703d82ffb276034 100644
--- a/examples/inter-cluster/inter-network.yaml
+++ b/examples/inter-cluster/inter-network.yaml
@@ -1,15 +1,15 @@
-apiVersion: l2sm.k8s.local/v1
+apiVersion: l2sm.l2sm.k8s.local/v1
 kind: L2SMNetwork
 metadata:
-  name: spain-network
+  name: ping-network
 spec:
-  type: inter-vnet
+  type: ext-vnet
+  provider:
+    name: "Universidad Carlos III de Madrid"
+    domain: idco.uc3m.es
   config: |
     {
-      "provider": {
-        "name": "uc3m",
-        "domain": "idco.uc3m.es"
-      },
-      "accessList": ["public-key-1", "public-key-2"]
+      "accessList": ["public-key-1", "public-key-2"],
+      "signature": "sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ===="
+
     }
-  signature: sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ====
diff --git a/examples/ping-pong/network.yaml b/examples/ping-pong/network.yaml
index 900bab719ca0cfc2a8732305fc33f87b48be107c..dca308769559617bcae15933c600215215e87ab0 100644
--- a/examples/ping-pong/network.yaml
+++ b/examples/ping-pong/network.yaml
@@ -1,5 +1,5 @@
 apiVersion: l2sm.l2sm.k8s.local/v1
-kind: L2SMNetwork
+kind: L2Network
 metadata:
   name: ping-network
 spec:
diff --git a/examples/ping-pong/ping.yaml b/examples/ping-pong/ping.yaml
index fda551568728a3d08dfd3777b958d53f0c32f640..83990d8c91566c30b759c4f3f75017f00ebc8558 100644
--- a/examples/ping-pong/ping.yaml
+++ b/examples/ping-pong/ping.yaml
@@ -6,7 +6,6 @@ metadata:
     app: ping-pong
   annotations:
     l2sm/networks: '[{"name": "ping-network", "ips":["192.168.1.6/24"]}]'
-    
 spec:
   containers:
   - name: router