diff --git a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json
index c8d23160..5b8ff092 100644
--- a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json
+++ b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json
@@ -11,7 +11,7 @@
           "name": "m1.tiny"
         },
         "image": {
-          "name": "cirros-0.3.2-x86_64-uec"
+          "name": "^cirros.*uec$"
         }
       },
       "context": {
diff --git a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml
index 50e039b8..9974fb90 100644
--- a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml
+++ b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml
@@ -5,7 +5,7 @@
         flavor:
             name: "m1.tiny"
         image:
-            name: "cirros-0.3.2-x86_64-uec"
+            name: "^cirros.*uec$"
       runner:
         type: "constant"
         times: 1
diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.json b/samples/tasks/scenarios/nova/boot-and-rebuild.json
index 6e28dba9..9293bc3d 100644
--- a/samples/tasks/scenarios/nova/boot-and-rebuild.json
+++ b/samples/tasks/scenarios/nova/boot-and-rebuild.json
@@ -6,10 +6,10 @@
                     "name": "m1.tiny"
                 },
                 "from_image": {
-                    "name": "cirros-0.3.2-x86_64-uec"
+                    "name": "^cirros.*uec$"
                 },
                 "to_image": {
-                    "name": "cirros-0.3.2-x86_64-uec"
+                    "name": "^cirros.*uec$"
                 }
             },
             "runner": {
diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.yaml b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml
index f519dd05..1f644bff 100644
--- a/samples/tasks/scenarios/nova/boot-and-rebuild.yaml
+++ b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml
@@ -4,9 +4,9 @@ NovaServers.boot_and_rebuild_server:
     flavor:
       name: "m1.tiny"
     from_image:
-      name: "cirros-0.3.2-x86_64-uec"
+      name: "^cirros.*uec$"
     to_image:
-      name: "cirros-0.3.2-x86_64-uec"
+      name: "^cirros.*uec$"
   runner:
     type: constant
     times: 5
diff --git a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json
index ffa3acd1..69e23e12 100644
--- a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json
+++ b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json
@@ -6,7 +6,7 @@
                     "name": "m1.tiny"
                 },
                 "image": {
-                    "name": "cirros-0.3.2-x86_64-uec"
+                    "name": "^cirros.*uec$"
                 }
             },
             "runner": {
diff --git a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml
index e7e01a85..b1f9e788 100644
--- a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml
+++ b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml
@@ -5,7 +5,7 @@
         flavor:
             name: "m1.tiny"
         image:
-            name: "cirros-0.3.2-x86_64-uec"
+            name: "^cirros.*uec$"
       runner:
         type: "constant"
         times: 10