diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b83f2f0d35..e08322c3da 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -202,6 +202,7 @@ projects:
       - gate-meetbot-merge
 
   - name: openstack-infra/config
+    merge-mode: cherry-pick
     check:
       - gate-config-merge:
         - gate-config-syntax