diff --git a/stx-openstack-helm/centos/build_srpm.data b/stx-openstack-helm/centos/build_srpm.data
index ae32e7bd..723967d4 100644
--- a/stx-openstack-helm/centos/build_srpm.data
+++ b/stx-openstack-helm/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="stx-openstack-helm"
 COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd $PKG_BASE/../../../helm-charts/ceph-pools-audit"
-TIS_PATCH_VER=9
+TIS_PATCH_VER=10
diff --git a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
index bfeca2f0..a3cacdc7 100644
--- a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
+++ b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
@@ -643,6 +643,10 @@ data:
   chart_name: libvirt
   release: openstack-libvirt
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-libvirt
   install:
     no_hooks: false
   upgrade:
@@ -673,11 +677,10 @@ data:
   release: openstack-openvswitch
   namespace: openstack
   # If we deploy ovs-dpdk on the host, ovs pod will not be created.
-  # We can use "native wait" instead. But it's not supported in current armada version.
-  # Before we upgrade armada to new version, we comment the wait
-  # https://github.com/openstack/airship-armada/blob/master/armada/schemas/armada-chart-schema.yaml#L81-L111
-  #wait:
-  #  timeout: 1800
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-openvswitch
   install:
     no_hooks: false
   upgrade:
@@ -708,6 +711,10 @@ data:
   chart_name: nova
   release: openstack-nova
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-nova
   test:
     enabled: false
   install:
@@ -998,6 +1005,10 @@ data:
   chart_name: neutron
   release: openstack-neutron
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-neutron
   test:
     enabled: false
   install: