diff --git a/src/kubernetes-api/config/dev/openssl.cnf b/src/kubernetes-api/config/dev/openssl.cnf
index 57784128e9fe9e0fbb9971556b0cebaf9f072ee6..73f4ad5b760d9ebab50749fc9d084ce914ad080c 100644
--- a/src/kubernetes-api/config/dev/openssl.cnf
+++ b/src/kubernetes-api/config/dev/openssl.cnf
@@ -28,6 +28,6 @@ extendedKeyUsage = serverAuth
 
 [ alt_names ]
 IP.1 = 127.0.0.1
-IP.2 = 10.0.2.4
+IP.2 = 192.168.122.60
 DNS.1 = localhost
 DNS.2 = webhook-server.local
diff --git a/src/kubernetes-api/config/dev/webhookcainjection_patch.yaml b/src/kubernetes-api/config/dev/webhookcainjection_patch.yaml
index c21a924c8a08ba7536b3894f3f3871a71376ccf3..97a8adeb024bd2887019c753596d7d53307088ff 100644
--- a/src/kubernetes-api/config/dev/webhookcainjection_patch.yaml
+++ b/src/kubernetes-api/config/dev/webhookcainjection_patch.yaml
@@ -12,8 +12,8 @@ metadata:
 webhooks:
   - name: mpod.kb.io
     clientConfig:
-      url: https://10.0.2.4:9443/mutate-v1-pod
-      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURIVENDQWdXZ0F3SUJBZ0lVZHFYNk14MmU5dmVvZlFjV0hRWEZhaDA4ajJjd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0dERVdNQlFHQTFVRUF3d05iRzlqWVd3dGQyVmlhRzl2YXpBZUZ3MHlOREE0TURjeE1UVTVNekZhRncweQpOVEE0TURjeE1UVTVNekZhTUJneEZqQVVCZ05WQkFNTURXeHZZMkZzTFhkbFltaHZiMnN3Z2dFaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURjc3ppcVZPNmF3UUo2SVREbk90a1pFS1NEVFdrWEFVZDEKaU9kQUo5Q24rZVZjdlAxNGhjVTU0ejZ5NXJwWXRVbXJDMlpZVUlhelViZzFDUXBQb253Q2RaSnlpT0FCNVppQwp4RmxWdk0yUmtvK0xoYzRIU080Yis0VUlDc0M4eUlrSDlKTTM1b2E0WVh2dmJGaFZicUFvejUxK2VianJwaDBkCmk0TGhJVHFuSnp1cXVCSnJUOTRTeTJvalVSSUlIQzdHdG9aNUlpRWVlZGkrRFNlZkt4WFhlL0dzT2xYV3VyVFUKVTg2b1BleTFIUlpSZXJaWG9hNHdSeDVqVkxidFNoL0JhYXVueFV1OHFJcVBFdFQ4aXZkdHhJRmc1NFN5UFl0ZApYZnRsNTFTa3pHRDh4UXRrMkEwZGZPeTFCdVBoK1NZcTc2SDhhUnZRVGlrZ3R0VS92TEVCQWdNQkFBR2pYekJkCk1EWUdBMVVkRVFRdk1DMkhCSDhBQUFHSEJBb0FBZ1NDQ1d4dlkyRnNhRzl6ZElJVWQyVmlhRzl2YXkxelpYSjIKWlhJdWJHOWpZV3d3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUEwRwpDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ3VPa2IvSStaQkUxNHBYSjhTUi9oNlk2VVRhTlpEVmpRMCtkSHV5aGFVCmZCRVRNMWZDYUpiQ2tmaGNtZEFvTGY0MzJUczBERmY4QTVybGlMTmQybGJodHFEclQxRGZUY1MwWkoxRTBIeHgKU1E3aDVZcjZvSk1mL2pDbWtheUZZSzh5RUlEdUo4Qmxmek1iVGlZL2Z2WHU1SHlvVi9uWkYzT2REM1pFWWtyTApVb3NsNEgzY1Z3WHVta3BDUjN0dDVvd3FvQnI5UUMyOEJvTjRxTDhqdWhvTCtZNTcyMUFKUExBYnRRZXRxWmFYClJEOXdLYW9BTFdLVFZIUzNiVWk2Y3JOK2RuV01YemtzNnBwNVNHYXk4K3czbFJOQnV0U3dpRWFHU202V092SGkKdXBOc2FxVEMrVGZHMXNzZ3c0cHR4WElrR2RoZ3ZUYnRZMTF5Ylh3eVdpcjMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+      url: https://192.168.122.60:9443/mutate-v1-pod
+      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURIVENDQWdXZ0F3SUJBZ0lVSFo1SkszNmRERnJHclJ5b0RlYlFSeTVZdXZNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0dERVdNQlFHQTFVRUF3d05iRzlqWVd3dGQyVmlhRzl2YXpBZUZ3MHlOREE1TVRjeE1qSTNNRFZhRncweQpOVEE1TVRjeE1qSTNNRFZhTUJneEZqQVVCZ05WQkFNTURXeHZZMkZzTFhkbFltaHZiMnN3Z2dFaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURXWGFjZ3B3K3prMlFSb1YvdVhuMldNZ0xGczZuckZGU0YKdUVKSXBFb3p3UTZJTnZNeTN6RDFVM0ptQlZ2K2NLL1N5bmJNMFdnUE95blhaVU9qTXJUVncwak9ZNjNFVkdJUQoyZW5CeXdXUGZHd1BQZDdKYzk2REZJVzRIY3VvVlJaOFpMei91UmZxQ2J6VElEVG80WUFBbE05TzgyTWpQUHIyCkpTSTBJbkpsbi9IdWtPTlB4MUNYZU14UVdIWGZEcUNWMTBUWU5oNjhUNHUxKzQ5V2E3MGVmQmtsSW1XT3crTnkKT3RxOC9nV28ySTQvaDBnVkRqN3V4VEVWblgrU2NvdUE3eW90SDhwMi9aZmcxQkRaYzAwdXRVSm42ZVZaQzYyWgpTWnFSRWlwV0RSenNidXY5cmppUkxGV3A0VzVvcFpMUUVvUFMyV3VxL1NKZEY5UENUZkViQWdNQkFBR2pYekJkCk1EWUdBMVVkRVFRdk1DMkhCSDhBQUFHSEJNQ29lanlDQ1d4dlkyRnNhRzl6ZElJVWQyVmlhRzl2YXkxelpYSjIKWlhJdWJHOWpZV3d3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUEwRwpDU3FHU0liM0RRRUJDd1VBQTRJQkFRQlcxVUlSbXRFUDY0aEUwOEpPWCtrbDlxTFhFb2IyVDE5TTh4ODV6VCtoCnVvMm8vN3Ztd2ZHTmhmZ25PT0o2eXUxSzhUM2RSeDdza0RybUNYWFdpV3l2M25DeGIwcUo1WUtBWkNaNGZvdTUKejZkMUVnelphTUJsMFZpL01KMDRNemV6MnNtSXN1QzA1c1doWjVDVDhCNGVjM1hFdlFJOTZ5QUhYL1Rjd2hMeQpzZWN1c1QyZDRlUldjSEVCR3NEUnhlejdEcU85UUl0T3JaR0htWHlnOC83cjFTTUhhTmFyMWU4QTY4bVEvZiszCjFyUkowVUF6MWRrK09JUkFPNmM5eVRoTUdVdzJwbklkcVRSTWRiWERMSVdLb1FQM0Y1RXh0bG5lajg5S3F0TXoKc0JkVEUrWHVUTWtGais3UTRZbk1WQ3BBdTNVOUtueHVVaGFvblcrdkhyOU4KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
     rules:
       - operations: [ "CREATE", "UPDATE" ]
         apiGroups: [""]
diff --git a/src/kubernetes-api/config/samples/l2sm_v1_l2network.yaml b/src/kubernetes-api/config/samples/l2sm_v1_l2network.yaml
index d551c0ee506b55ed4ea5f6b7e72f96d131d06c1a..be1e985ce254caf7ac5b6a4f1b87428c3a6dcc91 100644
--- a/src/kubernetes-api/config/samples/l2sm_v1_l2network.yaml
+++ b/src/kubernetes-api/config/samples/l2sm_v1_l2network.yaml
@@ -1,12 +1,16 @@
 apiVersion: l2sm.l2sm.k8s.local/v1
-kind: L2Network
+kind: L2SMNetwork
 metadata:
-  labels:
-    app.kubernetes.io/name: l2network
-    app.kubernetes.io/instance: l2network-sample
-    app.kubernetes.io/part-of: l2network
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: l2network
-  name: l2network-sample
+  name: ping-network
 spec:
-  # TODO(user): Add fields here
+  type: vnet
+  provider:
+    name: "Universidad Carlos III de Madrid"
+    domain: idco.uc3m.es
+    config: |
+    {
+      "accessList": ["public-key-1", "public-key-2"],
+      "signature": "sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ===="
+
+    }
+  overlay: overlay-sample
\ No newline at end of file
diff --git a/src/kubernetes-api/config/samples/l2sm_v1_overlay.yaml b/src/kubernetes-api/config/samples/l2sm_v1_overlay.yaml
index 9186d389212c406a47278e04f524af353458d34f..17259116998c93794af84e8e744fc262c8e74495 100644
--- a/src/kubernetes-api/config/samples/l2sm_v1_overlay.yaml
+++ b/src/kubernetes-api/config/samples/l2sm_v1_overlay.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: l2sm-switch
-          image: alexdecb/l2sm-switch:2.6
+          image: alexdecb/l2sm-switch:2.7
           resources: {}
           env:
           - name: NODENAME
@@ -34,6 +34,11 @@ spec:
             value: "10"  
           - name: CONTROLLERIP
             value: "l2sm-controller-service"
+          - name: PODNAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+          imagePullPolicy: Always
           securityContext:
             capabilities:
               add: ["NET_ADMIN"]
diff --git a/src/kubernetes-api/config/webhook/service.yaml b/src/kubernetes-api/config/webhook/service.yaml
index 41f08a050f01eaaaa1dce8b14282b347afb7973b..67e4c17d93a2e35923740eb6b78f6321ced50790 100644
--- a/src/kubernetes-api/config/webhook/service.yaml
+++ b/src/kubernetes-api/config/webhook/service.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/part-of: controllermanager
     app.kubernetes.io/managed-by: kustomize
   name: webhook-service
-  namespace: system
+  namespace: l2sm-system
 spec:
   ports:
     - port: 443