diff --git a/.charts.yml b/.charts.yml
index 01d122b..c19c5ef 100644
--- a/.charts.yml
+++ b/.charts.yml
@@ -113,10 +113,6 @@
     version: 0.1.27
     repository: *openstack_helm_infra_repository
     dependencies: *openstack_helm_dependencies
-    patches:
-      gerrit:
-        review.opendev.org:
-          - 893406
   - name: loki
     version: 6.6.3
     repository:
diff --git a/charts/barbican/charts/helm-toolkit/requirements.lock b/charts/barbican/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/barbican/charts/helm-toolkit/requirements.lock
+++ b/charts/barbican/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/barbican/requirements.lock b/charts/barbican/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/barbican/requirements.lock
+++ b/charts/barbican/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ceph-csi-rbd/requirements.lock b/charts/ceph-csi-rbd/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/ceph-csi-rbd/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ceph-provisioners/charts/helm-toolkit/requirements.lock b/charts/ceph-provisioners/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/ceph-provisioners/charts/helm-toolkit/requirements.lock
+++ b/charts/ceph-provisioners/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ceph-provisioners/requirements.lock b/charts/ceph-provisioners/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/ceph-provisioners/requirements.lock
+++ b/charts/ceph-provisioners/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/cert-manager-webhook-infoblox-wapi/requirements.lock b/charts/cert-manager-webhook-infoblox-wapi/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/cert-manager-webhook-infoblox-wapi/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/cinder/charts/helm-toolkit/requirements.lock b/charts/cinder/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/cinder/charts/helm-toolkit/requirements.lock
+++ b/charts/cinder/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/cinder/requirements.lock b/charts/cinder/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/cinder/requirements.lock
+++ b/charts/cinder/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/coredns/requirements.lock b/charts/coredns/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/coredns/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/designate/charts/helm-toolkit/requirements.lock b/charts/designate/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/designate/charts/helm-toolkit/requirements.lock
+++ b/charts/designate/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/designate/requirements.lock b/charts/designate/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/designate/requirements.lock
+++ b/charts/designate/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/glance/charts/helm-toolkit/requirements.lock b/charts/glance/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/glance/charts/helm-toolkit/requirements.lock
+++ b/charts/glance/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/glance/requirements.lock b/charts/glance/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/glance/requirements.lock
+++ b/charts/glance/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/godaddy-webhook/requirements.lock b/charts/godaddy-webhook/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/godaddy-webhook/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/goldpinger/requirements.lock b/charts/goldpinger/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/goldpinger/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/heat/charts/helm-toolkit/requirements.lock b/charts/heat/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/heat/charts/helm-toolkit/requirements.lock
+++ b/charts/heat/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/heat/requirements.lock b/charts/heat/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/heat/requirements.lock
+++ b/charts/heat/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/horizon/charts/helm-toolkit/requirements.lock b/charts/horizon/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/horizon/charts/helm-toolkit/requirements.lock
+++ b/charts/horizon/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/horizon/requirements.lock b/charts/horizon/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/horizon/requirements.lock
+++ b/charts/horizon/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ingress-nginx/requirements.lock b/charts/ingress-nginx/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/ingress-nginx/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ironic/charts/helm-toolkit/requirements.lock b/charts/ironic/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/ironic/charts/helm-toolkit/requirements.lock
+++ b/charts/ironic/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ironic/requirements.lock b/charts/ironic/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/ironic/requirements.lock
+++ b/charts/ironic/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/keycloak/requirements.lock b/charts/keycloak/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/keycloak/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/keystone/charts/helm-toolkit/requirements.lock b/charts/keystone/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/keystone/charts/helm-toolkit/requirements.lock
+++ b/charts/keystone/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/keystone/requirements.lock b/charts/keystone/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/keystone/requirements.lock
+++ b/charts/keystone/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/kube-prometheus-stack/requirements.lock b/charts/kube-prometheus-stack/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/kube-prometheus-stack/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/libvirt/charts/helm-toolkit/requirements.lock b/charts/libvirt/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/libvirt/charts/helm-toolkit/requirements.lock
+++ b/charts/libvirt/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/libvirt/requirements.lock b/charts/libvirt/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/libvirt/requirements.lock
+++ b/charts/libvirt/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/loki/requirements.lock b/charts/loki/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/loki/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/magnum/charts/helm-toolkit/requirements.lock b/charts/magnum/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/magnum/charts/helm-toolkit/requirements.lock
+++ b/charts/magnum/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/magnum/requirements.lock b/charts/magnum/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/magnum/requirements.lock
+++ b/charts/magnum/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/manila/charts/helm-toolkit/requirements.lock b/charts/manila/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/manila/charts/helm-toolkit/requirements.lock
+++ b/charts/manila/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/manila/requirements.lock b/charts/manila/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/manila/requirements.lock
+++ b/charts/manila/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/memcached/charts/helm-toolkit/requirements.lock b/charts/memcached/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/memcached/charts/helm-toolkit/requirements.lock
+++ b/charts/memcached/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/memcached/requirements.lock b/charts/memcached/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/memcached/requirements.lock
+++ b/charts/memcached/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/neutron/charts/helm-toolkit/requirements.lock b/charts/neutron/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/neutron/charts/helm-toolkit/requirements.lock
+++ b/charts/neutron/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/neutron/requirements.lock b/charts/neutron/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/neutron/requirements.lock
+++ b/charts/neutron/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/node-feature-discovery/requirements.lock b/charts/node-feature-discovery/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/node-feature-discovery/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/nova/charts/helm-toolkit/requirements.lock b/charts/nova/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/nova/charts/helm-toolkit/requirements.lock
+++ b/charts/nova/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/nova/requirements.lock b/charts/nova/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/nova/requirements.lock
+++ b/charts/nova/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/octavia/charts/helm-toolkit/requirements.lock b/charts/octavia/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/octavia/charts/helm-toolkit/requirements.lock
+++ b/charts/octavia/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/octavia/requirements.lock b/charts/octavia/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/octavia/requirements.lock
+++ b/charts/octavia/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/openvswitch/charts/helm-toolkit/requirements.lock b/charts/openvswitch/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/openvswitch/charts/helm-toolkit/requirements.lock
+++ b/charts/openvswitch/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/openvswitch/requirements.lock b/charts/openvswitch/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/openvswitch/requirements.lock
+++ b/charts/openvswitch/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ovn/charts/helm-toolkit/requirements.lock b/charts/ovn/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/ovn/charts/helm-toolkit/requirements.lock
+++ b/charts/ovn/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/ovn/requirements.lock b/charts/ovn/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/ovn/requirements.lock
+++ b/charts/ovn/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/patches/libvirt/0000-issue-certs-in-init-container.patch b/charts/patches/libvirt/0000-issue-certs-in-init-container.patch
new file mode 100644
index 0000000..c0f5f54
--- /dev/null
+++ b/charts/patches/libvirt/0000-issue-certs-in-init-container.patch
@@ -0,0 +1,297 @@
+From 0e654ba688e7bcc8daeb8c1ce812c5ed743a89ad Mon Sep 17 00:00:00 2001
+From: root <okozachenko1203@gmail.com>
+Date: Fri, 01 Sep 2023 01:10:50 +1000
+Subject: [PATCH] Issue certificates for libvirt in initContainer
+
+In this patch, certificates are generated in initContainer.
+It allows us to issue certificates using pod ip per a replica.
+This change is backward compatible by overriding
+scripts.cert_init_sh in values.
+https://review.opendev.org/c/openstack/openstack-helm-infra/+/893406/9
+
+Change-Id: I54d0e57f363fcac07055cc97720505dc1641bbdc
+---
+
+diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl
+index 357bfe3..0f96c0b 100644
+--- a/libvirt/templates/bin/_libvirt.sh.tpl
++++ b/libvirt/templates/bin/_libvirt.sh.tpl
+@@ -16,6 +16,24 @@
+ 
+ set -ex
+ 
++# NOTE(mnaser): This will move the API certificates into the expected location.
++if [ -f /tmp/api.crt ]; then
++  mkdir -p /etc/pki/CA /etc/pki/libvirt/private
++
++  cp /tmp/api-ca.crt {{ .Values.conf.libvirt.ca_file }}
++  cp /tmp/api-ca.crt /etc/pki/qemu/ca-cert.pem
++
++  cp /tmp/api.crt {{ .Values.conf.libvirt.cert_file }}
++  cp /tmp/api.crt /etc/pki/libvirt/clientcert.pem
++  cp /tmp/api.crt /etc/pki/qemu/server-cert.pem
++  cp /tmp/api.crt /etc/pki/qemu/client-cert.pem
++
++  cp /tmp/api.key {{ .Values.conf.libvirt.key_file }}
++  cp /tmp/api.key /etc/pki/libvirt/private/clientkey.pem
++  cp /tmp/api.key /etc/pki/qemu/server-key.pem
++  cp /tmp/api.key /etc/pki/qemu/client-key.pem
++fi
++
+ # NOTE(mnaser): This will move the VNC certificates into the expected location.
+ if [ -f /tmp/vnc.crt ]; then
+   mkdir -p /etc/pki/libvirt-vnc
+diff --git a/libvirt/templates/configmap-bin.yaml b/libvirt/templates/configmap-bin.yaml
+index ca1a7ec..9b74179 100644
+--- a/libvirt/templates/configmap-bin.yaml
++++ b/libvirt/templates/configmap-bin.yaml
+@@ -26,9 +26,9 @@
+ {{- end }}
+   libvirt.sh: |
+ {{ tuple "bin/_libvirt.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+-{{- if eq .Values.conf.qemu.vnc_tls "1" }}
++{{- if or (eq .Values.conf.libvirt.listen_tls "1") (eq .Values.conf.qemu.vnc_tls "1") }}
+   cert-init.sh: |
+-{{ tpl .Values.conf.vencrypt.cert_init_sh . | indent 4 }}
++{{ tpl .Values.scripts.cert_init_sh . | indent 4 }}
+ {{- end }}
+ {{- if .Values.conf.ceph.enabled }}
+   ceph-keyring.sh: |
+diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml
+index 4a0b128..35cd6e1 100644
+--- a/libvirt/templates/daemonset-libvirt.yaml
++++ b/libvirt/templates/daemonset-libvirt.yaml
+@@ -79,6 +79,43 @@
+       initContainers:
+ {{ tuple $envAll "pod_dependency" $mounts_libvirt_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
+ {{ dict "envAll" $envAll | include "helm-toolkit.snippets.kubernetes_apparmor_loader_init_container" | indent 8 }}
++{{- if $ssl_enabled }}
++        - name: cert-init-api
++{{ tuple $envAll "kubectl" | include "helm-toolkit.snippets.image" | indent 10 }}
++{{ dict "envAll" $envAll "application" "libvirt" "container" "cert_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
++          command:
++            - /tmp/cert-init.sh
++          env:
++            - name: TYPE
++              value: api
++            - name: ISSUER_KIND
++              value: {{ .Values.issuers.libvirt.kind }}
++            - name: ISSUER_NAME
++              value: {{ .Values.issuers.libvirt.name }}
++            - name: POD_UID
++              valueFrom:
++                fieldRef:
++                  fieldPath: metadata.uid
++            - name: POD_NAME
++              valueFrom:
++                fieldRef:
++                  fieldPath: metadata.name
++            - name: POD_NAMESPACE
++              valueFrom:
++                fieldRef:
++                  fieldPath: metadata.namespace
++            - name: POD_IP
++              valueFrom:
++                fieldRef:
++                  fieldPath: status.podIP
++          volumeMounts:
++            - name: pod-tmp
++              mountPath: /tmp
++            - name: libvirt-bin
++              mountPath: /tmp/cert-init.sh
++              subPath: cert-init.sh
++              readOnly: true
++{{- end }}
+ {{- if eq .Values.conf.qemu.vnc_tls "1" }}
+         - name: cert-init-vnc
+ {{ tuple $envAll "kubectl" | include "helm-toolkit.snippets.image" | indent 10 }}
+@@ -89,9 +126,9 @@
+             - name: TYPE
+               value: vnc
+             - name: ISSUER_KIND
+-              value: {{ .Values.conf.vencrypt.issuer.kind }}
++              value: {{ .Values.issuers.vencrypt.kind }}
+             - name: ISSUER_NAME
+-              value: {{ .Values.conf.vencrypt.issuer.name }}
++              value: {{ .Values.issuers.vencrypt.name }}
+             - name: POD_UID
+               valueFrom:
+                 fieldRef:
+@@ -202,10 +239,10 @@
+                   - |-
+                     kill $(cat /var/run/libvirtd.pid)
+           volumeMounts:
+-            {{ dict "enabled" $ssl_enabled "name" "ssl-client" "path" "/etc/pki/libvirt" "certs" (tuple "clientcert.pem" "clientkey.pem" ) | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
+-            {{ dict "enabled" $ssl_enabled "name" "ssl-server-cert" "path" "/etc/pki/libvirt" "certs" (tuple "servercert.pem" ) | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
+-            {{ dict "enabled" $ssl_enabled "name" "ssl-server-key" "path" "/etc/pki/libvirt/private" "certs" (tuple "serverkey.pem" ) | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
+-            {{ dict "enabled" $ssl_enabled "name" "ssl-ca-cert" "path" "/etc/pki/CA" "certs" (tuple "cacert.pem" ) | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
++{{- if $ssl_enabled }}
++            - name: etc-pki-qemu
++              mountPath: /etc/pki/qemu
++{{- end }}
+             - name: pod-tmp
+               mountPath: /tmp
+             - name: libvirt-bin
+@@ -291,10 +328,11 @@
+               {{- end }}
+         {{- end }}
+       volumes:
+-        {{ dict "enabled" $ssl_enabled "secretName" $envAll.Values.secrets.tls.client "name" "ssl-client" "path" "/etc/pki/libvirt" "certs" (tuple "clientcert.pem" "clientkey.pem" ) | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
+-        {{ dict "enabled" $ssl_enabled "secretName" $envAll.Values.secrets.tls.server "name" "ssl-server-cert" "path" "/etc/pki/libvirt" "certs" (tuple "servercert.pem" ) | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
+-        {{ dict "enabled" $ssl_enabled "secretName" $envAll.Values.secrets.tls.server "name" "ssl-server-key" "path" "/etc/pki/libvirt/private" "certs" (tuple "serverkey.pem" ) | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
+-        {{ dict "enabled" $ssl_enabled "secretName" $envAll.Values.secrets.tls.server "name" "ssl-ca-cert" "path" "/etc/pki/CA" "certs" (tuple "cacert.pem" ) | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
++{{- if $ssl_enabled }}
++        - name: etc-pki-qemu
++          hostPath:
++            path: /etc/pki/qemu
++{{- end }}
+         - name: pod-tmp
+           emptyDir: {}
+         - name: libvirt-bin
+diff --git a/libvirt/values.yaml b/libvirt/values.yaml
+index 0821d9c..207b8fb 100644
+--- a/libvirt/values.yaml
++++ b/libvirt/values.yaml
+@@ -90,6 +90,17 @@
+   configmap: ceph-etc
+   user_secret_name: pvc-ceph-client-key
+ 
++# Issuers for TLS certificates
++issuers:
++  # Issuer to issue a certificate for libvirt api when listen_tls is enabled
++  libvirt:
++    kind: ClusterIssuer
++    name: ca-clusterissuer
++  # Issuer to issue a certificate for vencrypt
++  vencrypt:
++    kind: ClusterIssuer
++    name: ca-clusterissuer
++
+ conf:
+   ceph:
+     enabled: true
+@@ -121,61 +132,9 @@
+     stdio_handler: "file"
+     user: "nova"
+     group: "kvm"
++    default_tls_x509_cert_dir: /etc/pki/qemu
+   kubernetes:
+     cgroup: "kubepods.slice"
+-  vencrypt:
+-    # Issuer to use for the vencrypt certs.
+-    issuer:
+-      kind: ClusterIssuer
+-      name: ca-clusterissuer
+-    # Script is included here (vs in bin/) to allow overriding, in the case that
+-    # communication happens over an IP other than the pod IP for some reason.
+-    cert_init_sh: |
+-      #!/bin/bash
+-      set -x
+-
+-      HOSTNAME_FQDN=$(hostname --fqdn)
+-
+-      # Script to create certs for each libvirt pod based on pod IP (by default).
+-      cat <<EOF | kubectl apply -f -
+-      apiVersion: cert-manager.io/v1
+-      kind: Certificate
+-      metadata:
+-        name: ${POD_NAME}-${TYPE}
+-        namespace: ${POD_NAMESPACE}
+-        ownerReferences:
+-          - apiVersion: v1
+-            kind: Pod
+-            name: ${POD_NAME}
+-            uid: ${POD_UID}
+-      spec:
+-        secretName: ${POD_NAME}-${TYPE}
+-        commonName: ${POD_IP}
+-        usages:
+-        - client auth
+-        - server auth
+-        dnsNames:
+-        - ${HOSTNAME}
+-        - ${HOSTNAME_FQDN}
+-        ipAddresses:
+-        - ${POD_IP}
+-        issuerRef:
+-          kind: ${ISSUER_KIND}
+-          name: ${ISSUER_NAME}
+-      EOF
+-
+-      kubectl -n ${POD_NAMESPACE} wait --for=condition=Ready --timeout=300s \
+-        certificate/${POD_NAME}-${TYPE}
+-
+-      # NOTE(mnaser): cert-manager does not clean-up the secrets when the certificate
+-      #               is deleted, so we should add an owner reference to the secret
+-      #               to ensure that it is cleaned up when the pod is deleted.
+-      kubectl -n ${POD_NAMESPACE} patch secret ${POD_NAME}-${TYPE} \
+-        --type=json -p='[{"op": "add", "path": "/metadata/ownerReferences", "value": [{"apiVersion": "v1", "kind": "Pod", "name": "'${POD_NAME}'", "uid": "'${POD_UID}'"}]}]'
+-
+-      kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.tls\.crt}' | base64 -d > /tmp/${TYPE}.crt
+-      kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.tls\.key}' | base64 -d > /tmp/${TYPE}.key
+-      kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.ca\.crt}' | base64 -d > /tmp/${TYPE}-ca.crt
+ 
+ pod:
+   probes:
+@@ -312,6 +271,55 @@
+         - endpoint: internal
+           service: local_image_registry
+ 
++scripts:
++  # Script is included here (vs in bin/) to allow overriding.
++  cert_init_sh: |
++    #!/bin/bash
++    set -x
++
++    HOSTNAME_FQDN=$(hostname --fqdn)
++
++    # Script to create certs for each libvirt pod based on pod IP (by default).
++    cat <<EOF | kubectl apply -f -
++    apiVersion: cert-manager.io/v1
++    kind: Certificate
++    metadata:
++      name: ${POD_NAME}-${TYPE}
++      namespace: ${POD_NAMESPACE}
++      ownerReferences:
++        - apiVersion: v1
++          kind: Pod
++          name: ${POD_NAME}
++          uid: ${POD_UID}
++    spec:
++      secretName: ${POD_NAME}-${TYPE}
++      commonName: ${POD_IP}
++      usages:
++      - client auth
++      - server auth
++      dnsNames:
++      - ${HOSTNAME}
++      - ${HOSTNAME_FQDN}
++      ipAddresses:
++      - ${POD_IP}
++      issuerRef:
++        kind: ${ISSUER_KIND}
++        name: ${ISSUER_NAME}
++    EOF
++
++    kubectl -n ${POD_NAMESPACE} wait --for=condition=Ready --timeout=300s \
++      certificate/${POD_NAME}-${TYPE}
++
++    # NOTE(mnaser): cert-manager does not clean-up the secrets when the certificate
++    #               is deleted, so we should add an owner reference to the secret
++    #               to ensure that it is cleaned up when the pod is deleted.
++    kubectl -n ${POD_NAMESPACE} patch secret ${POD_NAME}-${TYPE} \
++      --type=json -p='[{"op": "add", "path": "/metadata/ownerReferences", "value": [{"apiVersion": "v1", "kind": "Pod", "name": "'${POD_NAME}'", "uid": "'${POD_UID}'"}]}]'
++
++    kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.tls\.crt}' | base64 -d > /tmp/${TYPE}.crt
++    kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.tls\.key}' | base64 -d > /tmp/${TYPE}.key
++    kubectl -n ${POD_NAMESPACE} get secret ${POD_NAME}-${TYPE} -o jsonpath='{.data.ca\.crt}' | base64 -d > /tmp/${TYPE}-ca.crt
++
+ manifests:
+   configmap_bin: true
+   configmap_etc: true
+@@ -327,4 +335,5 @@
+   tls:
+     server: libvirt-tls-server
+     client: libvirt-tls-client
++
+ ...
diff --git a/charts/placement/charts/helm-toolkit/requirements.lock b/charts/placement/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/placement/charts/helm-toolkit/requirements.lock
+++ b/charts/placement/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/placement/requirements.lock b/charts/placement/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/placement/requirements.lock
+++ b/charts/placement/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/prometheus-pushgateway/requirements.lock b/charts/prometheus-pushgateway/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/prometheus-pushgateway/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/pxc-operator/requirements.lock b/charts/pxc-operator/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/pxc-operator/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/rabbitmq-cluster-operator/requirements.lock b/charts/rabbitmq-cluster-operator/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/rabbitmq-cluster-operator/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/rook-ceph-cluster/requirements.lock b/charts/rook-ceph-cluster/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/rook-ceph-cluster/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/rook-ceph/requirements.lock b/charts/rook-ceph/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/rook-ceph/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/tempest/charts/helm-toolkit/requirements.lock b/charts/tempest/charts/helm-toolkit/requirements.lock
index 808bd94..e28bc5d 100644
--- a/charts/tempest/charts/helm-toolkit/requirements.lock
+++ b/charts/tempest/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/tempest/requirements.lock b/charts/tempest/requirements.lock
index 43aa382..b92539b 100644
--- a/charts/tempest/requirements.lock
+++ b/charts/tempest/requirements.lock
@@ -3,4 +3,4 @@
   repository: https://tarballs.openstack.org/openstack-helm-infra
   version: 0.2.64
 digest: sha256:4c00b9bfa1d3dc0426a82ec22f51b440e838c55cbd1f81dbf7de5b28471f6141
-generated: '0001-01-01T00:00:00Z'
+generated: "0001-01-01T00:00:00Z"
diff --git a/charts/vector/requirements.lock b/charts/vector/requirements.lock
new file mode 100644
index 0000000..e28bc5d
--- /dev/null
+++ b/charts/vector/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/tox.ini b/tox.ini
index 6e55c35..bed67e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,10 +11,12 @@
   PYTHONDONTWRITEBYTECODE=1
 passenv =
   KUBECONFIG
+  ATMOSPHERE_*
 
 [testenv:venv]
 passenv =
-  ATMOSPHERE_NETWORK_BACKEND
+  ATMOSPHERE_*
+  OS_*
 commands =
   {posargs}
 
@@ -26,21 +28,12 @@
 commands =
   python3 {toxinidir}/build/pin-images.py roles/defaults/vars/main.yml roles/defaults/vars/main.yml
 
-[testenv:sync-charts]
-skipsdist = True
-deps =
-  chart-vendor
-commands =
-  chart-vendor
-
 [testenv:linters]
 skipsdist = True
 deps =
-  {[testenv:sync-charts]deps}
   pre-commit
 commands =
   pre-commit run --all-files --show-diff-on-failure
-  chart-vendor --check
   python3 {toxinidir}/build/lint-jobs.py
 
 [testenv:py3]
@@ -51,7 +44,8 @@
 
 [testenv:molecule-venv]
 passenv =
-  ATMOSPHERE_NETWORK_BACKEND
+  ATMOSPHERE_*
+  OS_*
 deps =
   molecule
   kubernetes
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 928ee15..8b5abe7 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,9 +1,11 @@
 - job:
+    name: atmosphere-chart-vendor
+    parent: chart-vendor
+
+- job:
     name: atmosphere-linters
     parent: tox-linters
     pre-run: zuul.d/playbooks/linters/pre.yml
-    required-projects:
-      - name: vexxhost/chart-vendor
 
 - job:
     name: atmosphere-tox-py3
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d7c6238..666bdee 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,6 +16,7 @@
     merge-mode: squash-merge
     check:
       jobs:
+        - atmosphere-chart-vendor
         - atmosphere-linters
         - atmosphere-tox-py3
         - atmosphere-build-collection:
@@ -84,6 +85,7 @@
             dependencies: *molecule_check_dependencies
     gate:
       jobs:
+        - atmosphere-chart-vendor
         - atmosphere-linters
         - atmosphere-tox-py3
         - atmosphere-build-collection: