diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py
index 62ac6e2b16..40ab3abe69 100644
--- a/zuul/openstack_functions.py
+++ b/zuul/openstack_functions.py
@@ -97,7 +97,7 @@ def set_node_options(item, job, params, default):
     hook_re = r'^hook-(.*?)-(rtfd)$'
     python26_re = r'^.*-(py(thon)?)?26.*$'
     centos6_re = r'^.*-centos6.*$'
-    fedora_re = r'^.*-f2(1|2).*$'
+    fedora_re = r'^.*-f(edora-)?2(1|2).*$'
     tripleo_re = r'^.*-tripleo-ci.*$'
     kolla_image_re = r'^.*-kolla-build-images-.*$'
     openstack_ansible_re = r'^.*-openstack-ansible-.*$'