diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index 5a3eb510f11b0edc3af8c66445a3fdd20d3b87e8..add911c76913ec47c52eeffa90af15f65bdc1add 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -45,7 +45,7 @@
       "network_address": "chinqchint-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
-      "switch_port": "Gi2/41",
+      "switch_port": "Gi2/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
index c452d7fd006372767d55e05455077045c91c78bc..be7eb7c73ce4c4768e70efa2319b84ed2764a643 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
index 60d4fe6e002be1bb6411f7f4c2966baa74df9e9d..8006b8cdcdef8acd919a6a295951935b5a3ab7d7 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
index bd191df29590ea6aa0e7547a6026cb3eae5fc802..b8fe36a48db981aea7f3692042a375fa368a1f75 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
@@ -52,7 +52,7 @@
       "network_address": "chirloute-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
-      "switch_port": "Gi3/30",
+      "switch_port": "Gi4/44",
       "vendor": "Intel",
       "version": "82576EB"
     },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
index 6add01642e54c597d849dba4c1b4e094d4cf50f7..e06cba47d27bf18442deb1eca80ed83b474d0653 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
index 0ee70f38426f645ce4b8a546b66aab0f62c3c709..bf3a893c3e0660b1b6812da22f8cc0c9a30629e4 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
index d841872ff971d7b96c4a5e5c266d5e7c28d92d65..1ea77de40cc32fa568fa0c511e15654c8ecc0d29 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
index 877ea88a960b07dce2258024362fc5f16bd75ca7..dee29fd223e567ff96c8763af0db6af0ad2d1387 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
@@ -52,7 +52,7 @@
       "network_address": "chirloute-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
-      "switch_port": "Gi4/48",
+      "switch_port": "Gi2/41",
       "vendor": "Intel",
       "version": "82576EB"
     },
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
index 46dc8fe721edf4a69fd26d5efc4cd47a9f1300e5..7934b9d44eee22d30fd072b5e9a50c88c487467d 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -10,7 +10,7 @@
     "version": "1.66.00"
   },
   "gpu": {
-    "gpu": false,
+    "gpu": true,
     "gpu_count": 4,
     "gpu_model": "Tesla-S2050"
   },
diff --git a/generators/input/sites/lille/clusters/chinqchint.yaml b/generators/input/sites/lille/clusters/chinqchint.yaml
index a86aa5333d0e97c6120cf5bf16bf7262ed84411d..bdef04dd4b8562c808797fa396380299db294733 100644
--- a/generators/input/sites/lille/clusters/chinqchint.yaml
+++ b/generators/input/sites/lille/clusters/chinqchint.yaml
@@ -69,7 +69,7 @@ chinqchint-5:
     eth1:
       mac: 00:30:48:7c:6e:bf
       ip: 172.16.34.5
-      switch_port: Gi2/41
+      switch_port: Gi2/5
     myri0:
       mac: 00:60:dd:47:49:e7
       ip: 172.18.47.105
diff --git a/generators/input/sites/lille/clusters/chirloute.rb b/generators/input/sites/lille/clusters/chirloute.rb
index 500c067d1628a0103440e39da43835d15292e24f..5df20bf206a975a967199cd5081076de3e69c556 100644
--- a/generators/input/sites/lille/clusters/chirloute.rb
+++ b/generators/input/sites/lille/clusters/chirloute.rb
@@ -92,7 +92,7 @@ site :lille do |site_uid|
          })
 
          gpu({
-           :gpu        => false,
+           :gpu        => true,
            :gpu_count  => lookup('chirloute', node_uid, 'gpu', 'gpu_count'),
            :gpu_model => lookup('chirloute', node_uid, 'gpu', 'gpu_model'),
          })
diff --git a/generators/input/sites/lille/clusters/chirloute.yaml b/generators/input/sites/lille/clusters/chirloute.yaml
index 1d88b996027b70baced69242bcab5b962cd586dc..ec8182639ee6d4e0660c8c1cf30040aae9687735 100644
--- a/generators/input/sites/lille/clusters/chirloute.yaml
+++ b/generators/input/sites/lille/clusters/chirloute.yaml
@@ -71,7 +71,7 @@ chirloute-3:
     eth1:
       mac: 00:26:6c:f9:15:71
       ip: 172.16.35.3
-      switch_port: Gi3/30	
+      switch_port: Gi4/44	
   chassis:
     serial_number: D385Z4J
     manufacturer: Dell
@@ -187,7 +187,7 @@ chirloute-7:
     eth1:
       mac: 00:26:6c:f9:17:b9
       ip: 172.16.35.7
-      switch_port: Gi4/48
+      switch_port: Gi2/41
   chassis:
     serial_number: F385Z4J
     manufacturer: Dell