diff --git a/deployments/inter-cluster/veths.yaml b/deployments/inter-cluster/inter-veths.yaml
similarity index 100%
rename from deployments/inter-cluster/veths.yaml
rename to deployments/inter-cluster/inter-veths.yaml
diff --git a/deployments/inter-cluster/inter-vnet.yaml b/deployments/inter-cluster/inter-vnet.yaml
deleted file mode 100644
index 654b7fa35ef48217b3fc5f0821d52938e7d48bf9..0000000000000000000000000000000000000000
--- a/deployments/inter-cluster/inter-vnet.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
-  name: spain-network
-spec:
-  type: inter-vnet
-  config: |
-    {
-      "provider": {
-        "name": "uc3m",
-        "domain": "idco.uc3m.es"
-      },
-      "accessList": ["public-key-1", "public-key-2"]
-    }
-  signature: sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ====
diff --git a/deployments/inter-cluster/network.yaml b/deployments/inter-cluster/l2sm-network-crd.yaml
similarity index 90%
rename from deployments/inter-cluster/network.yaml
rename to deployments/inter-cluster/l2sm-network-crd.yaml
index 53dea2d5175974bd6ee6a0c933b51e27652ccaa3..229bfbed031fa21775a4faee08b28d85402db6aa 100644
--- a/deployments/inter-cluster/network.yaml
+++ b/deployments/inter-cluster/l2sm-network-crd.yaml
@@ -18,7 +18,7 @@ spec:
                 type:
                   type: string
                 config:
-                  type: string # This is now simply a string, intended to hold JSON data.
+                  type: string 
                   nullable: true
                 signature:
                   type: string
diff --git a/deployments/inter-cluster/ned.yaml b/deployments/inter-cluster/ned.yaml
index 8ee6de1adc3980fb8ed8fa6384bfb29d74067aa8..d77dbcd3632b41a3ad37d67feaeda75825de12aa 100644
--- a/deployments/inter-cluster/ned.yaml
+++ b/deployments/inter-cluster/ned.yaml
@@ -6,10 +6,24 @@ metadata:
     app: l2sm
 spec:
   hostNetwork: true
+  initContainers:
+      - name: wait-for-l2sm-operator
+        image: curlimages/curl
+        args:
+        - /bin/sh
+        - -c
+        - >
+          set -x;
+          while [ $(curl -sw '%{http_code}' "http://l2sm-operator-service:8080/healthz" -o /dev/null) -ne 200 ]; do
+            sleep 15;
+          done;
+          sleep 5;
   containers:
   - name: mycontainer
     image: alexdecb/l2sm-switch:2.2
     command: ["sleep", "infinity"]
     securityContext:
       capabilities:
-        add: ["NET_ADMIN"]
\ No newline at end of file
+        add: ["NET_ADMIN"]
+  nodeSelector:
+    dedicated: master
\ No newline at end of file
diff --git a/deployments/inter-cluster/ping.yaml b/deployments/inter-cluster/ping.yaml
deleted file mode 100644
index 665ec1d0b85a38bc3db4b3233889d4a48d6284ea..0000000000000000000000000000000000000000
--- a/deployments/inter-cluster/ping.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: ping
-  labels:
-    app: ping-pong
-  annotations:
-    l2sm/networks: ping-network
-spec:
-  containers:
-  - name: router
-    command: ["/bin/ash", "-c", "trap : TERM INT; sleep infinity & wait"]
-    image: alpine:latest
-    securityContext:
-      capabilities:
-        add: ["NET_ADMIN"]
-  # Use this parameter if you want to place the pod in a specific node
-  nodeName: l2sm1
diff --git a/deployments/inter-cluster/vlink.yaml b/deployments/inter-cluster/vlink.yaml
deleted file mode 100644
index fc6c27a1c999fdf4bfc7eea31d99447204ab30a4..0000000000000000000000000000000000000000
--- a/deployments/inter-cluster/vlink.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
-  name: vlink-sample
-spec:
-  type: vlink
-  config: |
-    {
-      "overlay-parameters": {
-        "path": {
-          "name": "first-path",
-          "FromEndpoint": "node-a",
-          "ToEndpoint": "node-e",
-          "links": ["link-ac","link-cd","link-de"],
-          "capabilities": {
-            "bandwidthBits": "20M",
-            "latencyNanos": "8e5"
-          }
-        },
-        "reverse-path": {
-          "name": "second-path",
-          "fromEndpoint": "node-e",
-          "toEndpoint": "node-a",
-          "links": ["link-ed","link-db","link-ba"]
-        }
-      }
-    }
diff --git a/deployments/inter-cluster/vnet.yaml b/deployments/inter-cluster/vnet.yaml
deleted file mode 100644
index b96a334588db4b08ceb9ecf3c1a317e59922ebb7..0000000000000000000000000000000000000000
--- a/deployments/inter-cluster/vnet.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
-  name: ping-network
-spec:
-  type: vnet
\ No newline at end of file