diff --git a/infrared/tasks/configure.yml b/infrared/tasks/configure.yml
index bd8884135..f5a385cd4 100644
--- a/infrared/tasks/configure.yml
+++ b/infrared/tasks/configure.yml
@@ -12,8 +12,8 @@
 - name: Set up Overcloud resources create cirros img
   shell: |
     source "{{ test.overcloudrc }}"
-    openstack image list --status active --limit 1 -f value -c Name| \
-    grep -q -w cirros || \
+    openstack image list --name cirros --status active --limit 1 \
+    -f value -c Name| grep -q -w cirros || \
     openstack image create cirros \
       --file cirros-0.4.0-x86_64-disk.img \
       --disk-format qcow2 \
diff --git a/infrared/tasks/templates/tobiko.conf.j2 b/infrared/tasks/templates/tobiko.conf.j2
index 7f7d62b2d..1d920925e 100644
--- a/infrared/tasks/templates/tobiko.conf.j2
+++ b/infrared/tasks/templates/tobiko.conf.j2
@@ -7,4 +7,4 @@ image = cirros
 flavor = m1.tiny
 key_file = ~/.ssh/id_rsa
 [neutron]
-floating_network = "{{ test.external_net }}"
\ No newline at end of file
+floating_network = "{{ test.floating_network }}"
\ No newline at end of file
diff --git a/plugin.spec b/plugin.spec
index 40efdb895..eb80c777f 100644
--- a/plugin.spec
+++ b/plugin.spec
@@ -31,11 +31,11 @@ subparsers:
                       default: "{{ ansible_env.HOME }}/tobiko_venv"
                       help: |
                           path of existing virtual environment
-                  external_net:
+                  floating_network:
                       type: Value
                       default: "public"
                       help: |
-                          Name of overcloud's external-net
+                          Name of overcloud's floating_network
                   tests:
                       type: Value
                       help: |