diff --git a/scenarios/additional/cross_az/l2.hot b/scenarios/additional/cross_az/l2.hot
index 349f68a..3636a49 100644
--- a/scenarios/additional/cross_az/l2.hot
+++ b/scenarios/additional/cross_az/l2.hot
@@ -68,7 +68,7 @@
     type: OS::Nova::Server
     properties:
       name: {{ agent.id }}
-      image: {% if agent.zone == 'vcenter' %} shaker-image-vcenter {% else %} shaker-image-nova {% endif %}
+      image: { get_param: image }
       flavor: { get_param: flavor }
       availability_zone: "{{ agent.availability_zone }}"
       networks:
diff --git a/scenarios/additional/cross_az/l3_east_west.hot b/scenarios/additional/cross_az/l3_east_west.hot
index 2bcfede..5b90b2d 100644
--- a/scenarios/additional/cross_az/l3_east_west.hot
+++ b/scenarios/additional/cross_az/l3_east_west.hot
@@ -85,7 +85,7 @@
     type: OS::Nova::Server
     properties:
       name: {{ agent.id }}
-      image: {% if agent.zone == 'vcenter' %} shaker-image-vcenter {% else %} shaker-image-nova {% endif %}
+      image: { get_param: image }
       flavor: { get_param: flavor }
       availability_zone: "{{ agent.availability_zone }}"
       networks:
diff --git a/scenarios/additional/cross_az/l3_north_south.hot b/scenarios/additional/cross_az/l3_north_south.hot
index 76ffa6c..06b4b56 100644
--- a/scenarios/additional/cross_az/l3_north_south.hot
+++ b/scenarios/additional/cross_az/l3_north_south.hot
@@ -92,7 +92,7 @@
     type: OS::Nova::Server
     properties:
       name: {{ agent.id }}
-      image: {% if agent.zone == 'vcenter' %} shaker-image-vcenter {% else %} shaker-image-nova {% endif %}
+      image: { get_param: image }
       flavor: { get_param: flavor }
       availability_zone: "{{ agent.availability_zone }}"
       networks:
diff --git a/scenarios/additional/external/perf_l3_north_south_no_fip.yaml b/scenarios/additional/external/perf_l3_north_south_no_fip.yaml
index ff9e2c1..44c2301 100644
--- a/scenarios/additional/external/perf_l3_north_south_no_fip.yaml
+++ b/scenarios/additional/external/perf_l3_north_south_no_fip.yaml
@@ -16,7 +16,7 @@
   -
     title: Ping
     class: flent
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     method: ping
     time: 10
     sla:
@@ -24,14 +24,14 @@
   -
     title: TCP egress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     sla:
     - "[type == 'agent'] >> (stats.bandwidth.avg > 5000)"
     - "[type == 'agent'] >> (stats.retransmits.max < 10)"
   -
     title: TCP ingress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     reverse: yes
     sla:
     - "[type == 'agent'] >> (stats.bandwidth.avg > 5000)"
@@ -39,7 +39,7 @@
   -
     title: UDP egress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     udp: on
     bandwidth: 0
     datagram_size: 32
@@ -48,7 +48,7 @@
   -
     title: UDP ingress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     reverse: yes
     udp: on
     bandwidth: 0
diff --git a/scenarios/additional/external/perf_l3_north_south_with_fip.yaml b/scenarios/additional/external/perf_l3_north_south_with_fip.yaml
index 1aa60ef..8fe9137 100644
--- a/scenarios/additional/external/perf_l3_north_south_with_fip.yaml
+++ b/scenarios/additional/external/perf_l3_north_south_with_fip.yaml
@@ -16,7 +16,7 @@
   -
     title: Ping
     class: flent
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     method: ping
     time: 10
     sla:
@@ -24,14 +24,14 @@
   -
     title: TCP egress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     sla:
     - "[type == 'agent'] >> (stats.bandwidth.avg > 5000)"
     - "[type == 'agent'] >> (stats.retransmits.max < 10)"
   -
     title: TCP ingress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     reverse: yes
     sla:
     - "[type == 'agent'] >> (stats.bandwidth.avg > 5000)"
@@ -39,7 +39,7 @@
   -
     title: UDP egress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     udp: on
     bandwidth: 0
     datagram_size: 32
@@ -48,7 +48,7 @@
   -
     title: UDP ingress
     class: iperf3
-    host: ikoula.testdebit.info
+    host: bouygues.iperf.fr
     reverse: yes
     udp: on
     bandwidth: 0