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: