diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
index ac6cb05236..181179758a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
@@ -1,9 +1,11 @@
 - job:
     name: 'periodic-mirror-python26'
     node: mirror26
+    concurrent: false
 
     triggers:
       - timed: '4 21 * * *'
+      - zuul
 
     builders:
       - shell: |
@@ -20,9 +22,11 @@
 - job:
     name: 'periodic-mirror-python27'
     node: mirror27
+    concurrent: false
 
     triggers:
       - timed: '12 21 * * *'
+      - zuul
 
     builders:
       - shell: |
diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py
index 6692026770..b2e0c2b076 100644
--- a/modules/openstack_project/files/zuul/openstack_functions.py
+++ b/modules/openstack_project/files/zuul/openstack_functions.py
@@ -3,5 +3,6 @@ def devstack_params(change, params):
         params['NODE_LABEL'] = 'devstack-oneiric'
 
 def python27_params(change, params):
-    if change.branch == 'stable/diablo':
+    if (hasattr(change, 'branch') and
+        change.branch == 'stable/diablo'):
         params['NODE_LABEL'] = 'oneiric'