diff --git a/yamllint.conf b/yamllint.conf
index 62ff69c417..bd14375431 100644
--- a/yamllint.conf
+++ b/yamllint.conf
@@ -16,7 +16,8 @@ rules:
   document-start: disable
   empty-lines: enable
   empty-values: disable
-  hyphens: enable
+  hyphens:
+    ignore: zuul.d/jobs-openstack-helm.yaml
   indentation:
     spaces: 2
     indent-sequences: whatever
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 155e42e84a..dc374f33db 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -82,14 +82,14 @@
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/scripts/tls/cert-manager.sh
-        - ./tools/deployment/component/ceph/ceph.sh
-        - ./tools/deployment/component/ceph/ceph-ns-activate.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
+        - - ./tools/deployment/common/setup-client.sh
+          - ./tools/scripts/tls/cert-manager.sh
+          - ./tools/deployment/component/ceph/ceph.sh
+        - - ./tools/deployment/component/ceph/ceph-ns-activate.sh
+          - ./tools/deployment/component/common/ingress.sh
+        - - ./tools/deployment/component/common/mariadb.sh
+          - ./tools/deployment/component/common/memcached.sh
+          - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/cinder/cinder.sh
 - job:
@@ -171,17 +171,17 @@
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/scripts/tls/cert-manager.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/heat/heat.sh
-        - ./tools/deployment/component/glance/glance.sh
-        - ./tools/deployment/component/compute-kit/openvswitch.sh
+        - - ./tools/deployment/common/setup-client.sh
+          - ./tools/scripts/tls/cert-manager.sh
+        - - ./tools/deployment/component/common/ingress.sh
+        - - ./tools/deployment/component/common/mariadb.sh
+          - ./tools/deployment/component/common/memcached.sh
+          - ./tools/deployment/component/common/rabbitmq.sh
+        - - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
+          - ./tools/deployment/component/keystone/keystone.sh
+        - - ./tools/deployment/component/heat/heat.sh
+          - ./tools/deployment/component/glance/glance.sh
+          - ./tools/deployment/component/compute-kit/openvswitch.sh
         - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/component/compute-kit/compute-kit.sh
         - ./tools/deployment/developer/common/170-setup-gateway.sh
@@ -416,20 +416,20 @@
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
+        - - ./tools/deployment/common/deploy-k8s.sh
+          - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
-        - ./tools/deployment/component/compute-kit/tungsten-fabric.sh checkdns
-        - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/heat/heat.sh
-        - ./tools/deployment/component/glance/glance.sh
-        - ./tools/deployment/component/compute-kit/tungsten-fabric.sh prepare
-        - ./tools/deployment/component/compute-kit/libvirt.sh
+        - - ./tools/deployment/component/common/mariadb.sh
+          - ./tools/deployment/component/common/memcached.sh
+          - ./tools/deployment/component/common/rabbitmq.sh
+          - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
+        - - ./tools/deployment/component/compute-kit/tungsten-fabric.sh checkdns
+          - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns
+          - ./tools/deployment/component/keystone/keystone.sh
+        - - ./tools/deployment/component/heat/heat.sh
+          - ./tools/deployment/component/glance/glance.sh
+          - ./tools/deployment/component/compute-kit/tungsten-fabric.sh prepare
+          - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/component/compute-kit/compute-kit.sh
         - ./tools/deployment/component/compute-kit/tungsten-fabric.sh deploy
 - job: