diff --git a/data/grid5000/sites/grenoble/servers/kwapi.json b/data/grid5000/sites/grenoble/servers/kwapi.json
deleted file mode 100644
index 8e9c90950a618e02e009b4dd13d8bd18089bb122..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.31.154"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/kwapi.json b/data/grid5000/sites/lille/servers/kwapi.json
deleted file mode 100644
index 3d17362c3caf6a44dc1268249674f1a65722aa47..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.47.140"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/kwapi.json b/data/grid5000/sites/luxembourg/servers/kwapi.json
deleted file mode 100644
index 2ddf69a61f5ef854cf170b15b2067f8e5adb1747..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.191.127"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/kwapi.json b/data/grid5000/sites/lyon/servers/kwapi.json
deleted file mode 100644
index 1043fcdda406b4f57ea6142b0ee1c3e7bcfab815..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.63.127"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/kwapi.json b/data/grid5000/sites/nancy/servers/kwapi.json
deleted file mode 100644
index ca644ae3176674b74a937f36b9f61d833edae190..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.79.54"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/kwapi.json b/data/grid5000/sites/nantes/servers/kwapi.json
deleted file mode 100644
index d175f6f95ce892f42e35183a28cfaf7e9f07cc90..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nantes/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.207.125"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/kwapi.json b/data/grid5000/sites/rennes/servers/kwapi.json
deleted file mode 100644
index ee51fca91ccb5e02efb0991a95cc48237c58cb54..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.111.139"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/kwapi.json b/data/grid5000/sites/sophia/servers/kwapi.json
deleted file mode 100644
index bd21fc76aaec465903b6259139fd4f9b602be68f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/servers/kwapi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "kind": "virtual",
-  "network_adapters": {
-    "default": {
-      "ip": "172.16.143.128"
-    }
-  },
-  "type": "server",
-  "uid": "kwapi"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/servers/virtual.yaml b/input/grid5000/sites/grenoble/servers/virtual.yaml
index 6a98f0dfbb312245b65d8a88811013befdb53738..2bb5218c0e0b6305c95a8aaa4120e6ec222526ec 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -76,9 +76,6 @@ mu2:
   kind: virtual
   alias: [digitalis]
   network_adapters: {default: {ip: 172.16.31.152}, adm: {ip: 172.17.31.152}}
-kwapi:
-  kind: virtual
-  network_adapters: {default: {ip: 172.16.31.154}}
 supervision2:
   kind: virtual
   network_adapters: {default: {ip: 172.16.31.156}}
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 668dc044aba104d71f7e6bd0aba0f6ed2eacc12e..19b4ffa377ad937bffc41b6e13ccaaf7c26f13a2 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -160,11 +160,6 @@ kadeploy-devel:
       ip: 172.16.47.139
     adm:
       ip: 172.17.47.139
-kwapi:
-  kind: virtual
-  network_adapters:
-    default:
-      ip: 172.16.47.140
 supervision2:
   kind: virtual
   network_adapters:
diff --git a/input/grid5000/sites/luxembourg/servers/virtual.yaml b/input/grid5000/sites/luxembourg/servers/virtual.yaml
index a680ff6dc95c3bd302f6dd31183ff017cea43f6a..42d8b1c2175e408fdc276d9989173d9542ebc6e0 100644
--- a/input/grid5000/sites/luxembourg/servers/virtual.yaml
+++ b/input/grid5000/sites/luxembourg/servers/virtual.yaml
@@ -46,9 +46,6 @@ kavlan-2:
 kavlan-3:
   kind: virtual
   network_adapters: {default: {ip: 172.16.191.123}}
-kwapi:
-  kind: virtual
-  network_adapters: {default: {ip: 172.16.191.127}}
 ldap:
   kind: virtual
   network_adapters: {default: {ip: 172.16.191.104}}
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index bda4c0b2097bf9f97899b2a27f807c8b437aeeac..a76f52525eee73ed0dbd6d1910139cf31c1eadf2 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -71,9 +71,6 @@ kavlan-691:
 kadeploy-devel:
   kind: virtual
   network_adapters: {default: {ip: 172.16.63.126}, adm: {ip: 172.17.63.126}}
-kwapi:
-  kind: virtual
-  network_adapters: {default: {ip: 172.16.63.127}}
 nat:
   kind: virtual
   alias: [access]
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 333cb84001aaf8de42ab35d047638e2939f236ad..6535422bf3e3f41042258282b3092111c59d209b 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -80,9 +80,6 @@ supervision2:
 icinga:
   kind: virtual
   network_adapters: {default: {ip: 172.16.79.147}}
-kwapi:
-  kind: virtual
-  network_adapters: {default: {ip: 172.16.79.54}}
 jenkins:
   kind: virtual
   network_adapters: {default: {ip: 172.16.79.160}}
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index 5960c37a7d6d7b495bd693b16b2bff862f55a787..6807268efd18dd7af88088f3bb38ca858d6273f0 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -82,11 +82,6 @@ kavlan-3:
   network_adapters:
     default:
       ip: 172.16.207.124
-kwapi:
-  kind: virtual
-  network_adapters:
-    default:
-      ip: 172.16.207.125
 ldap:
   kind: virtual
   network_adapters:
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index b614ba5139e5cb568aaae7d12f7dc65d85fa57fb..e52d567a68493613adbeae37ee7095679c7f190a 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -92,9 +92,6 @@ frennes:
     - frontend
     - oar-api
   network_adapters: {default: {ip: 172.16.111.106}}
-kwapi:
-  kind: virtual
-  network_adapters: {default: {ip: 172.16.111.139}}
 users-api-devel:
   kind: virtual
   network_adapters: {default: {ip: 172.16.111.157}}
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index fb774ecd38b8673c14bc85fa2b5696e64ee37629..d6bb9a61c876ff87b997074002acb44be390fbf6 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -97,11 +97,6 @@ kavlan-3:
       ip: 172.16.143.123
     admin:
       ip: 172.17.143.120
-kwapi:
-  kind: virtual
-  network_adapters:
-    default:
-      ip: 172.16.143.128
 ldap:
   kind: virtual
   network_adapters: