diff --git a/charts/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/barbican/values.yaml b/charts/barbican/values.yaml
index 17aee72..67bdbbc 100644
--- a/charts/barbican/values.yaml
+++ b/charts/barbican/values.yaml
@@ -58,10 +58,12 @@
   priorityClassName:
     barbican_api: null
     barbican_tests: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     barbican_api: null
     barbican_tests: null
+    bootstrap: null
     db_sync: null
   security_context:
     barbican:
diff --git a/charts/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/heat/templates/job-trusts.yaml b/charts/heat/templates/job-trusts.yaml
index ae5bc64..e539e7f 100644
--- a/charts/heat/templates/job-trusts.yaml
+++ b/charts/heat/templates/job-trusts.yaml
@@ -43,6 +43,12 @@
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "heat-trusts" "containerNames" (list "heat-trusts" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.heat_trusts }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.heat_trusts }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.heat_trusts }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.heat_trusts }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
 {{ dict "envAll" $envAll "application" "trusts" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       restartPolicy: OnFailure
diff --git a/charts/heat/values.yaml b/charts/heat/values.yaml
index af99c49..e242d7d 100644
--- a/charts/heat/values.yaml
+++ b/charts/heat/values.yaml
@@ -1023,6 +1023,8 @@
     heat_engine_cleaner: null
     heat_purge_deleted: null
     heat_engine: null
+    heat_trusts: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     heat_api: null
@@ -1032,6 +1034,8 @@
     heat_engine_cleaner: null
     heat_purge_deleted: null
     heat_engine: null
+    heat_trusts: null
+    bootstrap: null
     db_sync: null
   security_context:
     heat:
diff --git a/charts/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/charts/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index b8a1dce..1db62b0 100644
--- a/charts/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/charts/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -71,6 +71,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.db_init }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.db_init }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.db_init }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.db_init }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "db_init" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/horizon/values.yaml b/charts/horizon/values.yaml
index b3782c5..33a74d2 100644
--- a/charts/horizon/values.yaml
+++ b/charts/horizon/values.yaml
@@ -1106,10 +1106,12 @@
   priorityClassName:
     horizon: null
     horizon_tests: null
+    db_init: null
     db_sync: null
   runtimeClassName:
     horizon: null
     horizon_tests: null
+    db_init: null
     db_sync: null
   security_context:
     horizon:
diff --git a/charts/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/ironic/templates/statefulset-conductor.yaml b/charts/ironic/templates/statefulset-conductor.yaml
index bcf6238..fc0031e 100644
--- a/charts/ironic/templates/statefulset-conductor.yaml
+++ b/charts/ironic/templates/statefulset-conductor.yaml
@@ -44,6 +44,12 @@
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
+{{ with .Values.pod.priorityClassName.ironic_conductor }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.ironic_conductor }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
 {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
diff --git a/charts/ironic/values.yaml b/charts/ironic/values.yaml
index d28463a..bc4b034 100644
--- a/charts/ironic/values.yaml
+++ b/charts/ironic/values.yaml
@@ -107,6 +107,7 @@
       api_url: null
     database:
       connection: null
+      max_retries: -1
     deploy:
       http_root: /var/lib/openstack-helm/httpboot
     glance:
@@ -641,9 +642,13 @@
 pod:
   priorityClassName:
     ironic_api: null
+    ironic_conductor: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     ironic_api: null
+    ironic_conductor: null
+    bootstrap: null
     db_sync: null
   affinity:
     anti:
diff --git a/charts/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/charts/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index b8a1dce..1db62b0 100644
--- a/charts/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/charts/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -71,6 +71,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.db_init }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.db_init }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.db_init }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.db_init }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "db_init" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/keystone/templates/job-credential-cleanup.yaml b/charts/keystone/templates/job-credential-cleanup.yaml
index 9f26802..3eac2b3 100644
--- a/charts/keystone/templates/job-credential-cleanup.yaml
+++ b/charts/keystone/templates/job-credential-cleanup.yaml
@@ -45,6 +45,12 @@
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "keystone-credential-cleanup" "containerNames" (list "keystone-credential-cleanup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
+{{ with .Values.pod.priorityClassName.keystone_credential_cleanup }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.keystone_credential_cleanup }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceName }}
       restartPolicy: Never
 {{ if $envAll.Values.pod.tolerations.keystone.enabled }}
diff --git a/charts/keystone/templates/job-credential-setup.yaml b/charts/keystone/templates/job-credential-setup.yaml
index 38ff3c8..c8710b6 100644
--- a/charts/keystone/templates/job-credential-setup.yaml
+++ b/charts/keystone/templates/job-credential-setup.yaml
@@ -74,6 +74,12 @@
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "keystone-credential-setup" "containerNames" (list "keystone-credential-setup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
+{{ with .Values.pod.priorityClassName.keystone_credential_setup }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.keystone_credential_setup }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceAccountName }}
 {{ dict "envAll" $envAll "application" "credential_setup" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       initContainers:
diff --git a/charts/keystone/templates/job-domain-manage.yaml b/charts/keystone/templates/job-domain-manage.yaml
index 87c82eb..41bc9b1 100644
--- a/charts/keystone/templates/job-domain-manage.yaml
+++ b/charts/keystone/templates/job-domain-manage.yaml
@@ -42,6 +42,12 @@
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "keystone-domain-manage" "containerNames" (list "keystone-domain-manage" "keystone-domain-manage-init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
+{{ with .Values.pod.priorityClassName.keystone_domain_manage }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.keystone_domain_manage }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceAccountName }}
 {{ dict "envAll" $envAll "application" "domain_manage" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       restartPolicy: OnFailure
diff --git a/charts/keystone/templates/job-fernet-setup.yaml b/charts/keystone/templates/job-fernet-setup.yaml
index d52aa6c..f41e788 100644
--- a/charts/keystone/templates/job-fernet-setup.yaml
+++ b/charts/keystone/templates/job-fernet-setup.yaml
@@ -74,6 +74,12 @@
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "keystone-fernet-setup" "containerNames" (list "keystone-fernet-setup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
+{{ with .Values.pod.priorityClassName.keystone_fernet_setup }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.keystone_fernet_setup }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceAccountName }}
 {{ dict "envAll" $envAll "application" "fernet_setup" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       initContainers:
diff --git a/charts/keystone/values.yaml b/charts/keystone/values.yaml
index c23a4ac..65e6f65 100644
--- a/charts/keystone/values.yaml
+++ b/charts/keystone/values.yaml
@@ -163,12 +163,24 @@
     keystone_tests: null
     keystone_credential_rotate: null
     keystone_fernet_rotate: null
+    keystone_credential_setup: null
+    keystone_fernet_setup: null
+    keystone_domain_manage: null
+    keystone_credential_cleanup: null
+    bootstrap: null
+    db_init: null
     db_sync: null
   runtimeClassName:
     keystone_api: null
     keystone_tests: null
     keystone_credential_rotate: null
     keystone_fernet_rotate: null
+    keystone_credential_setup: null
+    keystone_fernet_setup: null
+    keystone_domain_manage: null
+    keystone_credential_cleanup: null
+    bootstrap: null
+    db_init: null
     db_sync: null
   security_context:
     keystone:
diff --git a/charts/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/magnum/values.yaml b/charts/magnum/values.yaml
index 341f1ec..29b8198 100644
--- a/charts/magnum/values.yaml
+++ b/charts/magnum/values.yaml
@@ -485,10 +485,12 @@
   priorityClassName:
     magnum_api: null
     magnum_conductor: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     magnum_api: null
     magnum_conductor: null
+    bootstrap: null
     db_sync: null
   user:
     magnum:
diff --git a/charts/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/manila/values.yaml b/charts/manila/values.yaml
index 400d52d..4219862 100644
--- a/charts/manila/values.yaml
+++ b/charts/manila/values.yaml
@@ -72,6 +72,7 @@
     manila_scheduler: null
     manila_tests: null
     manila_share: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     manila_api: null
@@ -79,6 +80,7 @@
     manila_scheduler: null
     manila_tests: null
     manila_share: null
+    bootstrap: null
     db_sync: null
   security_context:
     manila:
diff --git a/charts/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/neutron/templates/daemonset-bagpipe-bgp.yaml b/charts/neutron/templates/daemonset-bagpipe-bgp.yaml
index fd4f093..e2bd90b 100644
--- a/charts/neutron/templates/daemonset-bagpipe-bgp.yaml
+++ b/charts/neutron/templates/daemonset-bagpipe-bgp.yaml
@@ -57,10 +57,10 @@
 {{ tuple "neutron_bagpipe_bgp" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "neutron_bagpipe_bgp" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-{{ with .Values.pod.priorityClassName.neutron_bagpipe_bgp }}
+{{ with .Values.pod.priorityClassName.bagpipe_bgp }}
       priorityClassName: {{ . }}
 {{ end }}
-{{ with .Values.pod.runtimeClassName.neutron_bagpipe_bgp }}
+{{ with .Values.pod.runtimeClassName.bagpipe_bgp }}
       runtimeClassName: {{ . }}
 {{ end }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/neutron/templates/daemonset-bgp-dragent.yaml b/charts/neutron/templates/daemonset-bgp-dragent.yaml
index caa6139..8a6a309 100644
--- a/charts/neutron/templates/daemonset-bgp-dragent.yaml
+++ b/charts/neutron/templates/daemonset-bgp-dragent.yaml
@@ -56,10 +56,10 @@
 {{ tuple "neutron_bgp_dragent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "neutron_bgp_dragent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-{{ with .Values.pod.priorityClassName.neutron_bgp_dragent }}
+{{ with .Values.pod.priorityClassName.bgp_dragent }}
       priorityClassName: {{ . }}
 {{ end }}
-{{ with .Values.pod.runtimeClassName.neutron_bgp_dragent }}
+{{ with .Values.pod.runtimeClassName.bgp_dragent }}
       runtimeClassName: {{ . }}
 {{ end }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/neutron/values.yaml b/charts/neutron/values.yaml
index 04e8fa9..21964dd 100644
--- a/charts/neutron/values.yaml
+++ b/charts/neutron/values.yaml
@@ -375,15 +375,15 @@
 
 pod:
   priorityClassName:
-    neutron_bagpipe_bgp: null
-    neutron_bgp_dragent: null
+    bagpipe_bgp: null
+    bgp_dragent: null
     neutron_dhcp_agent: null
     neutron_l2gw_agent: null
     neutron_l3_agent: null
     neutron_lb_agent: null
     neutron_metadata_agent: null
     neutron_netns_cleanup_cron: null
-    neutron_ovn_vpn_agent: null
+    ovn_vpn_agent: null
     neutron_ovn_metadata_agent: null
     neutron_ovs_agent: null
     neutron_sriov_agent: null
@@ -391,17 +391,18 @@
     neutron_rpc_server: null
     neutron_server: null
     neutron_tests: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
-    neutron_bagpipe_bgp: null
-    neutron_bgp_dragent: null
+    bagpipe_bgp: null
+    bgp_dragent: null
     neutron_dhcp_agent: null
     neutron_l2gw_agent: null
     neutron_l3_agent: null
     neutron_lb_agent: null
     neutron_metadata_agent: null
     neutron_netns_cleanup_cron: null
-    neutron_ovn_vpn_agent: null
+    ovn_vpn_agent: null
     neutron_ovn_metadata_agent: null
     neutron_ovs_agent: null
     neutron_sriov_agent: null
@@ -409,6 +410,7 @@
     neutron_rpc_server: null
     neutron_server: null
     neutron_tests: null
+    bootstrap: null
     db_sync: null
   sidecars:
     neutron_policy_server: false
diff --git a/charts/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/nova/templates/job-bootstrap.yaml b/charts/nova/templates/job-bootstrap.yaml
index de8812d..72cc319 100644
--- a/charts/nova/templates/job-bootstrap.yaml
+++ b/charts/nova/templates/job-bootstrap.yaml
@@ -40,6 +40,12 @@
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "bootstrap" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+{{ with .Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ . }}
+{{ end }}
+{{ with .Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ . }}
+{{ end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/charts/nova/values.yaml b/charts/nova/values.yaml
index 4967835..2b1a924 100644
--- a/charts/nova/values.yaml
+++ b/charts/nova/values.yaml
@@ -2050,6 +2050,7 @@
     nova_service_cleaner: null
     nova_compute_ironic: null
     nova_tests: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     nova_compute: null
@@ -2064,6 +2065,7 @@
     nova_service_cleaner: null
     nova_compute_ironic: null
     nova_tests: null
+    bootstrap: null
     db_sync: null
   probes:
     rpc_timeout: 60
diff --git a/charts/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/octavia/values.yaml b/charts/octavia/values.yaml
index 448c781..36fcbf0 100644
--- a/charts/octavia/values.yaml
+++ b/charts/octavia/values.yaml
@@ -531,12 +531,14 @@
     octavia_api: null
     octavia_housekeeping: null
     octavia_worker: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     octavia_health_manager: null
     octavia_api: null
     octavia_housekeeping: null
     octavia_worker: null
+    bootstrap: null
     db_sync: null
   user:
     octavia:
diff --git a/charts/patches/barbican/0004-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/barbican/0004-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..ea1de3e
--- /dev/null
+++ b/charts/patches/barbican/0004-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,39 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/barbican/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/barbican/values.yaml b/barbican/values.yaml
+index 17aee723..67bdbbc1 100644
+--- a/barbican/values.yaml
++++ b/barbican/values.yaml
+@@ -58,10 +58,12 @@ pod:
+   priorityClassName:
+     barbican_api: null
+     barbican_tests: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     barbican_api: null
+     barbican_tests: null
++    bootstrap: null
+     db_sync: null
+   security_context:
+     barbican:
diff --git a/charts/patches/heat/0003-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/heat/0003-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..7d29b82
--- /dev/null
+++ b/charts/patches/heat/0003-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,61 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml
+index ae5bc644..e539e7f9 100644
+--- a/heat/templates/job-trusts.yaml
++++ b/heat/templates/job-trusts.yaml
+@@ -43,6 +43,12 @@ spec:
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+ {{ dict "envAll" $envAll "podName" "heat-trusts" "containerNames" (list "heat-trusts" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.heat_trusts }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.heat_trusts }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.heat_trusts }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.heat_trusts }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+ {{ dict "envAll" $envAll "application" "trusts" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+       restartPolicy: OnFailure
+diff --git a/heat/values.yaml b/heat/values.yaml
+index af99c49c..e242d7d3 100644
+--- a/heat/values.yaml
++++ b/heat/values.yaml
+@@ -1023,6 +1023,8 @@ pod:
+     heat_engine_cleaner: null
+     heat_purge_deleted: null
+     heat_engine: null
++    heat_trusts: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     heat_api: null
+@@ -1032,6 +1034,8 @@ pod:
+     heat_engine_cleaner: null
+     heat_purge_deleted: null
+     heat_engine: null
++    heat_trusts: null
++    bootstrap: null
+     db_sync: null
+   security_context:
+     heat:
diff --git a/charts/patches/horizon/0005-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/horizon/0005-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..80160cd
--- /dev/null
+++ b/charts/patches/horizon/0005-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,39 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+index b8a1dce3..1db62b01 100644
+--- a/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
++++ b/horizon/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+@@ -71,6 +71,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.db_init }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.db_init }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.db_init }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.db_init }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "db_init" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/horizon/values.yaml b/horizon/values.yaml
+index b3782c57..33a74d2e 100644
+--- a/horizon/values.yaml
++++ b/horizon/values.yaml
+@@ -1106,10 +1106,12 @@ pod:
+   priorityClassName:
+     horizon: null
+     horizon_tests: null
++    db_init: null
+     db_sync: null
+   runtimeClassName:
+     horizon: null
+     horizon_tests: null
++    db_init: null
+     db_sync: null
+   security_context:
+     horizon:
diff --git a/charts/patches/ironic/0002-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/ironic/0002-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..9c908e0
--- /dev/null
+++ b/charts/patches/ironic/0002-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,65 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml
+index bcf6238c..fc0031ef 100644
+--- a/ironic/templates/statefulset-conductor.yaml
++++ b/ironic/templates/statefulset-conductor.yaml
+@@ -44,6 +44,12 @@ spec:
+         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+     spec:
++{{ with .Values.pod.priorityClassName.ironic_conductor }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.ironic_conductor }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       affinity:
+ {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
+diff --git a/ironic/values.yaml b/ironic/values.yaml
+index d28463aa..bc4b0349 100644
+--- a/ironic/values.yaml
++++ b/ironic/values.yaml
+@@ -107,6 +107,7 @@ conf:
+       api_url: null
+     database:
+       connection: null
++      max_retries: -1
+     deploy:
+       http_root: /var/lib/openstack-helm/httpboot
+     glance:
+@@ -641,9 +642,13 @@ endpoints:
+ pod:
+   priorityClassName:
+     ironic_api: null
++    ironic_conductor: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     ironic_api: null
++    ironic_conductor: null
++    bootstrap: null
+     db_sync: null
+   affinity:
+     anti:
diff --git a/charts/patches/keystone/0002-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/keystone/0002-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..71059c7
--- /dev/null
+++ b/charts/patches/keystone/0002-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,136 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/keystone/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+index b8a1dce3..1db62b01 100644
+--- a/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
++++ b/keystone/charts/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+@@ -71,6 +71,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.db_init }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.db_init }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.db_init }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.db_init }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "db_init" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/keystone/templates/job-credential-cleanup.yaml b/keystone/templates/job-credential-cleanup.yaml
+index 9f268027..3eac2b39 100644
+--- a/keystone/templates/job-credential-cleanup.yaml
++++ b/keystone/templates/job-credential-cleanup.yaml
+@@ -45,6 +45,12 @@ spec:
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+ {{ dict "envAll" $envAll "podName" "keystone-credential-cleanup" "containerNames" (list "keystone-credential-cleanup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+     spec:
++{{ with .Values.pod.priorityClassName.keystone_credential_cleanup }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.keystone_credential_cleanup }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceName }}
+       restartPolicy: Never
+ {{ if $envAll.Values.pod.tolerations.keystone.enabled }}
+diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml
+index 38ff3c8b..c8710b63 100644
+--- a/keystone/templates/job-credential-setup.yaml
++++ b/keystone/templates/job-credential-setup.yaml
+@@ -74,6 +74,12 @@ spec:
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+ {{ dict "envAll" $envAll "podName" "keystone-credential-setup" "containerNames" (list "keystone-credential-setup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+     spec:
++{{ with .Values.pod.priorityClassName.keystone_credential_setup }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.keystone_credential_setup }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+ {{ dict "envAll" $envAll "application" "credential_setup" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+       initContainers:
+diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml
+index 87c82ebd..41bc9b11 100644
+--- a/keystone/templates/job-domain-manage.yaml
++++ b/keystone/templates/job-domain-manage.yaml
+@@ -42,6 +42,12 @@ spec:
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+ {{ dict "envAll" $envAll "podName" "keystone-domain-manage" "containerNames" (list "keystone-domain-manage" "keystone-domain-manage-init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+     spec:
++{{ with .Values.pod.priorityClassName.keystone_domain_manage }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.keystone_domain_manage }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+ {{ dict "envAll" $envAll "application" "domain_manage" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+       restartPolicy: OnFailure
+diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml
+index d52aa6ce..f41e788d 100644
+--- a/keystone/templates/job-fernet-setup.yaml
++++ b/keystone/templates/job-fernet-setup.yaml
+@@ -74,6 +74,12 @@ spec:
+         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+ {{ dict "envAll" $envAll "podName" "keystone-fernet-setup" "containerNames" (list "keystone-fernet-setup") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+     spec:
++{{ with .Values.pod.priorityClassName.keystone_fernet_setup }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.keystone_fernet_setup }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+ {{ dict "envAll" $envAll "application" "fernet_setup" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+       initContainers:
+diff --git a/keystone/values.yaml b/keystone/values.yaml
+index c23a4ac0..65e6f658 100644
+--- a/keystone/values.yaml
++++ b/keystone/values.yaml
+@@ -163,12 +163,24 @@ pod:
+     keystone_tests: null
+     keystone_credential_rotate: null
+     keystone_fernet_rotate: null
++    keystone_credential_setup: null
++    keystone_fernet_setup: null
++    keystone_domain_manage: null
++    keystone_credential_cleanup: null
++    bootstrap: null
++    db_init: null
+     db_sync: null
+   runtimeClassName:
+     keystone_api: null
+     keystone_tests: null
+     keystone_credential_rotate: null
+     keystone_fernet_rotate: null
++    keystone_credential_setup: null
++    keystone_fernet_setup: null
++    keystone_domain_manage: null
++    keystone_credential_cleanup: null
++    bootstrap: null
++    db_init: null
+     db_sync: null
+   security_context:
+     keystone:
diff --git a/charts/patches/magnum/0003-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/magnum/0003-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..9a80b3a
--- /dev/null
+++ b/charts/patches/magnum/0003-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,39 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/magnum/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/magnum/values.yaml b/magnum/values.yaml
+index 341f1ecd..29b8198b 100644
+--- a/magnum/values.yaml
++++ b/magnum/values.yaml
+@@ -485,10 +485,12 @@ pod:
+   priorityClassName:
+     magnum_api: null
+     magnum_conductor: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     magnum_api: null
+     magnum_conductor: null
++    bootstrap: null
+     db_sync: null
+   user:
+     magnum:
diff --git a/charts/patches/manila/0004-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/manila/0004-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..ea30640
--- /dev/null
+++ b/charts/patches/manila/0004-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,42 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/manila/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/manila/values.yaml b/manila/values.yaml
+index 400d52da..42198625 100644
+--- a/manila/values.yaml
++++ b/manila/values.yaml
+@@ -72,6 +72,7 @@ pod:
+     manila_scheduler: null
+     manila_tests: null
+     manila_share: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     manila_api: null
+@@ -79,6 +80,7 @@ pod:
+     manila_scheduler: null
+     manila_tests: null
+     manila_share: null
++    bootstrap: null
+     db_sync: null
+   security_context:
+     manila:
diff --git a/charts/patches/neutron/0006-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/neutron/0006-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..a2f3d3b
--- /dev/null
+++ b/charts/patches/neutron/0006-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,109 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/neutron/templates/daemonset-bagpipe-bgp.yaml b/neutron/templates/daemonset-bagpipe-bgp.yaml
+index fd4f0930..e2bd90b5 100644
+--- a/neutron/templates/daemonset-bagpipe-bgp.yaml
++++ b/neutron/templates/daemonset-bagpipe-bgp.yaml
+@@ -57,10 +57,10 @@ spec:
+ {{ tuple "neutron_bagpipe_bgp" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
+     spec:
+ {{ dict "envAll" $envAll "application" "neutron_bagpipe_bgp" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+-{{ with .Values.pod.priorityClassName.neutron_bagpipe_bgp }}
++{{ with .Values.pod.priorityClassName.bagpipe_bgp }}
+       priorityClassName: {{ . }}
+ {{ end }}
+-{{ with .Values.pod.runtimeClassName.neutron_bagpipe_bgp }}
++{{ with .Values.pod.runtimeClassName.bagpipe_bgp }}
+       runtimeClassName: {{ . }}
+ {{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+diff --git a/neutron/templates/daemonset-bgp-dragent.yaml b/neutron/templates/daemonset-bgp-dragent.yaml
+index caa61391..8a6a3099 100644
+--- a/neutron/templates/daemonset-bgp-dragent.yaml
++++ b/neutron/templates/daemonset-bgp-dragent.yaml
+@@ -56,10 +56,10 @@ spec:
+ {{ tuple "neutron_bgp_dragent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
+     spec:
+ {{ dict "envAll" $envAll "application" "neutron_bgp_dragent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+-{{ with .Values.pod.priorityClassName.neutron_bgp_dragent }}
++{{ with .Values.pod.priorityClassName.bgp_dragent }}
+       priorityClassName: {{ . }}
+ {{ end }}
+-{{ with .Values.pod.runtimeClassName.neutron_bgp_dragent }}
++{{ with .Values.pod.runtimeClassName.bgp_dragent }}
+       runtimeClassName: {{ . }}
+ {{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+diff --git a/neutron/values.yaml b/neutron/values.yaml
+index dbb4fd00..57cb3b70 100644
+--- a/neutron/values.yaml
++++ b/neutron/values.yaml
+@@ -390,15 +390,15 @@ dependencies:
+ 
+ pod:
+   priorityClassName:
+-    neutron_bagpipe_bgp: null
+-    neutron_bgp_dragent: null
++    bagpipe_bgp: null
++    bgp_dragent: null
+     neutron_dhcp_agent: null
+     neutron_l2gw_agent: null
+     neutron_l3_agent: null
+     neutron_lb_agent: null
+     neutron_metadata_agent: null
+     neutron_netns_cleanup_cron: null
+-    neutron_ovn_vpn_agent: null
++    ovn_vpn_agent: null
+     neutron_ovn_metadata_agent: null
+     neutron_ovs_agent: null
+     neutron_sriov_agent: null
+@@ -406,17 +406,18 @@ pod:
+     neutron_rpc_server: null
+     neutron_server: null
+     neutron_tests: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+-    neutron_bagpipe_bgp: null
+-    neutron_bgp_dragent: null
++    bagpipe_bgp: null
++    bgp_dragent: null
+     neutron_dhcp_agent: null
+     neutron_l2gw_agent: null
+     neutron_l3_agent: null
+     neutron_lb_agent: null
+     neutron_metadata_agent: null
+     neutron_netns_cleanup_cron: null
+-    neutron_ovn_vpn_agent: null
++    ovn_vpn_agent: null
+     neutron_ovn_metadata_agent: null
+     neutron_ovs_agent: null
+     neutron_sriov_agent: null
+@@ -424,6 +425,7 @@ pod:
+     neutron_rpc_server: null
+     neutron_server: null
+     neutron_tests: null
++    bootstrap: null
+     db_sync: null
+   sidecars:
+     neutron_policy_server: false
diff --git a/charts/patches/nova/0003-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/nova/0003-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..880ecc4
--- /dev/null
+++ b/charts/patches/nova/0003-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,59 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/nova/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml
+index de8812dd..72cc319d 100644
+--- a/nova/templates/job-bootstrap.yaml
++++ b/nova/templates/job-bootstrap.yaml
+@@ -40,6 +40,12 @@ spec:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
+ {{ dict "envAll" $envAll "application" "bootstrap" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
++{{ with .Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ . }}
++{{ end }}
++{{ with .Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ . }}
++{{ end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       nodeSelector:
+diff --git a/nova/values.yaml b/nova/values.yaml
+index 4967835c..2b1a924a 100644
+--- a/nova/values.yaml
++++ b/nova/values.yaml
+@@ -2050,6 +2050,7 @@ pod:
+     nova_service_cleaner: null
+     nova_compute_ironic: null
+     nova_tests: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     nova_compute: null
+@@ -2064,6 +2065,7 @@ pod:
+     nova_service_cleaner: null
+     nova_compute_ironic: null
+     nova_tests: null
++    bootstrap: null
+     db_sync: null
+   probes:
+     rpc_timeout: 60
diff --git a/charts/patches/octavia/0003-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/octavia/0003-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..84e16c1
--- /dev/null
+++ b/charts/patches/octavia/0003-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,41 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 6b77004f..da3c4819 100644
+--- a/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/octavia/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -70,6 +70,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/octavia/values.yaml b/octavia/values.yaml
+index 448c781e..36fcbf0b 100644
+--- a/octavia/values.yaml
++++ b/octavia/values.yaml
+@@ -531,12 +531,14 @@ pod:
+     octavia_api: null
+     octavia_housekeeping: null
+     octavia_worker: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     octavia_health_manager: null
+     octavia_api: null
+     octavia_housekeeping: null
+     octavia_worker: null
++    bootstrap: null
+     db_sync: null
+   user:
+     octavia:
diff --git a/charts/patches/staffeln/0002-Fix-the-missing-priority-runtime-ClassName.patch b/charts/patches/staffeln/0002-Fix-the-missing-priority-runtime-ClassName.patch
new file mode 100644
index 0000000..1cf681e
--- /dev/null
+++ b/charts/patches/staffeln/0002-Fix-the-missing-priority-runtime-ClassName.patch
@@ -0,0 +1,41 @@
+From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001
+From: Dong Ma <dong.ma@vexxhost.com>
+Date: Thu, 13 Feb 2025 16:15:52 +0000
+Subject: [PATCH] Fix the missing {priority,runtime}ClassName
+
+diff --git a/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+index 5d98c8b7..478721d5 100644
+--- a/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
++++ b/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+@@ -69,6 +69,12 @@ spec:
+       annotations:
+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
+     spec:
++{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
++      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
++{{- end }}
++{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
++      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
++{{- end }}
+       serviceAccountName: {{ $serviceAccountName }}
+       restartPolicy: OnFailure
+       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
+diff --git a/staffeln/values.yaml b/staffeln/values.yaml
+index a1a3e292..e6e09c4b 100644
+--- a/staffeln/values.yaml
++++ b/staffeln/values.yaml
+@@ -57,10 +57,14 @@ pod:
+   priorityClassName:
+     staffeln_api: null
+     staffeln_conductor: null
++    staffeln_tests: null
++    bootstrap: null
+     db_sync: null
+   runtimeClassName:
+     staffeln_api: null
+     staffeln_conductor: null
++    staffeln_tests: null
++    bootstrap: null
+     db_sync: null
+   security_context:
+     staffeln:
diff --git a/charts/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/charts/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004..da3c481 100644
--- a/charts/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/charts/staffeln/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -70,6 +70,12 @@
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
+{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }}
+      priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }}
+{{- end }}
+{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }}
+      runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }}
+{{- end }}
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
       {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }}
diff --git a/charts/staffeln/values.yaml b/charts/staffeln/values.yaml
index a1a3e29..e6e09c4 100644
--- a/charts/staffeln/values.yaml
+++ b/charts/staffeln/values.yaml
@@ -57,10 +57,14 @@
   priorityClassName:
     staffeln_api: null
     staffeln_conductor: null
+    staffeln_tests: null
+    bootstrap: null
     db_sync: null
   runtimeClassName:
     staffeln_api: null
     staffeln_conductor: null
+    staffeln_tests: null
+    bootstrap: null
     db_sync: null
   security_context:
     staffeln:
diff --git a/roles/barbican/tests/priorityclass_test.yaml b/roles/barbican/tests/priorityclass_test.yaml
index cebccc4..21063c0 100644
--- a/roles/barbican/tests/priorityclass_test.yaml
+++ b/roles/barbican/tests/priorityclass_test.yaml
@@ -5,6 +5,10 @@
       - templates/deployment-api.yaml
       - templates/pod-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+    set:
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -18,18 +22,26 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
       - templates/deployment-api.yaml
       - templates/pod-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
           barbican_api: platform
           barbican_tests: platform
           db_sync: platform
+          bootstrap: platform
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -46,3 +58,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/barbican/tests/runtimeclass_test.yaml b/roles/barbican/tests/runtimeclass_test.yaml
index 2ee6b08..7c55c02 100644
--- a/roles/barbican/tests/runtimeclass_test.yaml
+++ b/roles/barbican/tests/runtimeclass_test.yaml
@@ -5,6 +5,10 @@
       - templates/deployment-api.yaml
       - templates/pod-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+    set:
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -18,18 +22,26 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
       - templates/deployment-api.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
           barbican_api: kata-clh
           barbican_tests: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -46,3 +58,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/heat/tests/priorityclass_test.yaml b/roles/heat/tests/priorityclass_test.yaml
index 64795d6..bef0fb4 100644
--- a/roles/heat/tests/priorityclass_test.yaml
+++ b/roles/heat/tests/priorityclass_test.yaml
@@ -10,6 +10,8 @@
       - templates/deployment-engine.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+      - templates/job-trusts.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -39,6 +41,14 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
+      - template: templates/job-trusts.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
@@ -50,6 +60,8 @@
       - templates/deployment-engine.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+      - templates/job-trusts.yaml
     set:
       pod:
         priorityClassName:
@@ -61,6 +73,8 @@
           heat_purge_deleted: platform
           heat_engine: platform
           db_sync: platform
+          bootstrap: platform
+          heat_trusts: platform
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -97,3 +111,13 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
+      - template: templates/job-trusts.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/heat/tests/runtimeclass_test.yaml b/roles/heat/tests/runtimeclass_test.yaml
index b85b2d0..754538b 100644
--- a/roles/heat/tests/runtimeclass_test.yaml
+++ b/roles/heat/tests/runtimeclass_test.yaml
@@ -10,6 +10,8 @@
       - templates/deployment-engine.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+      - templates/job-trusts.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -39,6 +41,14 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
+      - template: templates/job-trusts.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
@@ -50,6 +60,8 @@
       - templates/deployment-engine.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+      - templates/job-trusts.yaml
     set:
       pod:
         runtimeClassName:
@@ -61,6 +73,8 @@
           heat_purge_deleted: kata-clh
           heat_engine: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
+          heat_trusts: kata-clh
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -97,3 +111,13 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
+      - template: templates/job-trusts.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/horizon/tests/priorityclass_test.yaml b/roles/horizon/tests/priorityclass_test.yaml
index a0fda2b..08ec868 100644
--- a/roles/horizon/tests/priorityclass_test.yaml
+++ b/roles/horizon/tests/priorityclass_test.yaml
@@ -5,6 +5,7 @@
       - templates/deployment.yaml
       - templates/pod-helm-tests.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
     asserts:
       - template: templates/deployment.yaml
         documentIndex: 3
@@ -18,18 +19,24 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
       - templates/deployment.yaml
       - templates/pod-helm-tests.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
     set:
       pod:
         priorityClassName:
           horizon: platform
           horizon_tests: platform
           db_sync: platform
+          db_init: platform
     asserts:
       - template: templates/deployment.yaml
         documentIndex: 3
@@ -46,3 +53,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/horizon/tests/runtimeclass_test.yaml b/roles/horizon/tests/runtimeclass_test.yaml
index ebeb976..d4dda15 100644
--- a/roles/horizon/tests/runtimeclass_test.yaml
+++ b/roles/horizon/tests/runtimeclass_test.yaml
@@ -5,6 +5,7 @@
       - templates/deployment.yaml
       - templates/pod-helm-tests.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
     asserts:
       - template: templates/deployment.yaml
         documentIndex: 3
@@ -18,18 +19,24 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
       - templates/deployment.yaml
       - templates/pod-helm-tests.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
     set:
       pod:
         runtimeClassName:
           horizon: kata-clh
           horizon_tests: kata-clh
           db_sync: kata-clh
+          db_init: kata-clh
     asserts:
       - template: templates/deployment.yaml
         documentIndex: 3
@@ -46,3 +53,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/ironic/tests/priorityclass_test.yaml b/roles/ironic/tests/priorityclass_test.yaml
index 7bd89b3..aeaba8f 100644
--- a/roles/ironic/tests/priorityclass_test.yaml
+++ b/roles/ironic/tests/priorityclass_test.yaml
@@ -3,34 +3,58 @@
   - it: should support not having a priority class
     templates:
       - templates/deployment-api.yaml
+      - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/statefulset-conductor.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
       - template: templates/job-db-sync.yaml
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
       - templates/deployment-api.yaml
+      - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
           ironic_api: platform
+          ironic_conductor: platform
           db_sync: platform
+          bootstrap: platform
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/statefulset-conductor.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
       - template: templates/job-db-sync.yaml
         documentIndex: 3
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/ironic/tests/runtimeclass_test.yaml b/roles/ironic/tests/runtimeclass_test.yaml
index d93e9df..f2a4c33 100644
--- a/roles/ironic/tests/runtimeclass_test.yaml
+++ b/roles/ironic/tests/runtimeclass_test.yaml
@@ -3,34 +3,58 @@
   - it: should support not having a runtime class
     templates:
       - templates/deployment-api.yaml
+      - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/statefulset-conductor.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
       - template: templates/job-db-sync.yaml
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
       - templates/deployment-api.yaml
+      - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
           ironic_api: kata-clh
+          ironic_conductor: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/statefulset-conductor.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
       - template: templates/job-db-sync.yaml
         documentIndex: 3
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/keystone/tests/priorityclass_test.yaml b/roles/keystone/tests/priorityclass_test.yaml
index 2af620a..8524f9b 100644
--- a/roles/keystone/tests/priorityclass_test.yaml
+++ b/roles/keystone/tests/priorityclass_test.yaml
@@ -5,8 +5,14 @@
       - templates/deployment-api.yaml
       - templates/cron-job-credential-rotate.yaml
       - templates/cron-job-fernet-rotate.yaml
+      - templates/job-credential-cleanup.yaml
+      - templates/job-credential-setup.yaml
+      - templates/job-domain-manage.yaml
+      - templates/job-fernet-setup.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -20,6 +26,22 @@
         documentIndex: 3
         notExists:
           path: spec.jobTemplate.spec.template.spec.priorityClassName
+      - template: templates/job-credential-cleanup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
+      - template: templates/job-fernet-setup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
+      - template: templates/job-credential-setup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
+      - template: templates/job-domain-manage.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
       - template: templates/pod-rally-test.yaml
         documentIndex: 3
         notExists:
@@ -28,14 +50,25 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
-      - templates/deployment-api.yaml
-      - templates/cron-job-credential-rotate.yaml
-      - templates/cron-job-fernet-rotate.yaml
+      - templates/job-credential-cleanup.yaml
+      - templates/job-credential-setup.yaml
+      - templates/job-domain-manage.yaml
+      - templates/job-fernet-setup.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
@@ -43,7 +76,13 @@
           keystone_tests: platform
           keystone_credential_rotate: platform
           keystone_fernet_rotate: platform
+          keystone_credential_setup: platform
+          keystone_fernet_setup: platform
+          keystone_credential_cleanup: platform
+          keystone_domain_manage: platform
           db_sync: platform
+          db_init: platform
+          bootstrap: platform
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -60,6 +99,26 @@
         equal:
           path: spec.jobTemplate.spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-credential-setup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
+      - template: templates/job-fernet-setup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
+      - template: templates/job-credential-cleanup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
+      - template: templates/job-domain-manage.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
       - template: templates/pod-rally-test.yaml
         documentIndex: 3
         equal:
@@ -70,3 +129,13 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/keystone/tests/runtimeclass_test.yaml b/roles/keystone/tests/runtimeclass_test.yaml
index 18db463..4478d86 100644
--- a/roles/keystone/tests/runtimeclass_test.yaml
+++ b/roles/keystone/tests/runtimeclass_test.yaml
@@ -5,8 +5,14 @@
       - templates/deployment-api.yaml
       - templates/cron-job-credential-rotate.yaml
       - templates/cron-job-fernet-rotate.yaml
+      - templates/job-credential-cleanup.yaml
+      - templates/job-credential-setup.yaml
+      - templates/job-domain-manage.yaml
+      - templates/job-fernet-setup.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -20,6 +26,22 @@
         documentIndex: 3
         notExists:
           path: spec.jobTemplate.spec.template.spec.runtimeClassName
+      - template: templates/job-credential-cleanup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
+      - template: templates/job-fernet-setup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
+      - template: templates/job-credential-setup.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
+      - template: templates/job-domain-manage.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
       - template: templates/pod-rally-test.yaml
         documentIndex: 3
         notExists:
@@ -28,14 +50,28 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
       - templates/deployment-api.yaml
       - templates/cron-job-credential-rotate.yaml
       - templates/cron-job-fernet-rotate.yaml
+      - templates/job-credential-cleanup.yaml
+      - templates/job-credential-setup.yaml
+      - templates/job-domain-manage.yaml
+      - templates/job-fernet-setup.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-db-init.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
@@ -43,7 +79,13 @@
           keystone_tests: kata-clh
           keystone_credential_rotate: kata-clh
           keystone_fernet_rotate: kata-clh
+          keystone_credential_setup: kata-clh
+          keystone_fernet_setup: kata-clh
+          keystone_credential_cleanup: kata-clh
+          keystone_domain_manage: kata-clh
           db_sync: kata-clh
+          db_init: kata-clh
+          bootstrap: kata-clh
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -60,6 +102,26 @@
         equal:
           path: spec.jobTemplate.spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-credential-setup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
+      - template: templates/job-fernet-setup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
+      - template: templates/job-credential-cleanup.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
+      - template: templates/job-domain-manage.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
       - template: templates/pod-rally-test.yaml
         documentIndex: 3
         equal:
@@ -70,3 +132,13 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-db-init.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/magnum/tests/priorityclass_test.yaml b/roles/magnum/tests/priorityclass_test.yaml
index bff9129..2b69337 100644
--- a/roles/magnum/tests/priorityclass_test.yaml
+++ b/roles/magnum/tests/priorityclass_test.yaml
@@ -5,6 +5,10 @@
       - templates/deployment-api.yaml
       - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+    set:
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -18,18 +22,26 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
       - templates/deployment-api.yaml
       - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
           magnum_api: platform
           magnum_conductor: platform
           db_sync: platform
+          bootstrap: platform
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -46,3 +58,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/magnum/tests/runtimeclass_test.yaml b/roles/magnum/tests/runtimeclass_test.yaml
index 8db11ab..b939eba 100644
--- a/roles/magnum/tests/runtimeclass_test.yaml
+++ b/roles/magnum/tests/runtimeclass_test.yaml
@@ -5,6 +5,10 @@
       - templates/deployment-api.yaml
       - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
+    set:
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -18,18 +22,26 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
       - templates/deployment-api.yaml
       - templates/statefulset-conductor.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
           magnum_api: kata-clh
           magnum_conductor: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
+      bootstrap:
+        enabled: true
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -46,3 +58,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/manila/tests/priorityclass_test.yaml b/roles/manila/tests/priorityclass_test.yaml
index 397d8ea..9591737 100644
--- a/roles/manila/tests/priorityclass_test.yaml
+++ b/roles/manila/tests/priorityclass_test.yaml
@@ -8,6 +8,7 @@
       - templates/deployment-share.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -33,6 +34,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
@@ -42,6 +47,7 @@
       - templates/deployment-share.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
@@ -51,6 +57,7 @@
           manila_share: platform
           manila_tests: platform
           db_sync: platform
+          bootstrap: platform
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -82,3 +89,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/manila/tests/runtimeclass_test.yaml b/roles/manila/tests/runtimeclass_test.yaml
index 080d6c1..1a80ac3 100644
--- a/roles/manila/tests/runtimeclass_test.yaml
+++ b/roles/manila/tests/runtimeclass_test.yaml
@@ -8,6 +8,7 @@
       - templates/deployment-share.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -33,6 +34,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
@@ -42,6 +47,7 @@
       - templates/deployment-share.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
@@ -51,6 +57,7 @@
           manila_tests: kata-clh
           manila_share: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
     asserts:
       - template: templates/deployment-api.yaml
         documentIndex: 3
@@ -82,3 +89,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/neutron/tests/priorityclass_test.yaml b/roles/neutron/tests/priorityclass_test.yaml
index 30e5d9f..6cd6867 100644
--- a/roles/neutron/tests/priorityclass_test.yaml
+++ b/roles/neutron/tests/priorityclass_test.yaml
@@ -19,7 +19,10 @@
       - templates/deployment-server.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
+      bootstrap:
+        enabled: true
       network:
         backend:
           - openvswitch
@@ -97,6 +100,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
@@ -117,7 +124,10 @@
       - templates/deployment-server.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
+      bootstrap:
+        enabled: true
       network:
         backend:
           - openvswitch
@@ -125,15 +135,15 @@
           - linuxbridge
       pod:
         priorityClassName:
-          neutron_bagpipe_bgp: platform
-          neutron_bgp_dragent: platform
+          bagpipe_bgp: platform
+          bgp_dragent: platform
           neutron_dhcp_agent: platform
           neutron_l2gw_agent: platform
           neutron_l3_agent: platform
           neutron_lb_agent: platform
           neutron_metadata_agent: platform
           neutron_netns_cleanup_cron: platform
-          neutron_ovn_vpn_agent: platform
+          ovn_vpn_agent: platform
           neutron_ovn_metadata_agent: platform
           neutron_ovs_agent: platform
           neutron_sriov_agent: platform
@@ -142,6 +152,7 @@
           neutron_server: platform
           neutron_tests: platform
           db_sync: platform
+          bootstrap: platform
       manifests:
         daemonset_l2gw_agent: true
         daemonset_bagpipe_bgp: true
@@ -230,3 +241,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/neutron/tests/runtimeclass_test.yaml b/roles/neutron/tests/runtimeclass_test.yaml
index 0563026..0203f58 100644
--- a/roles/neutron/tests/runtimeclass_test.yaml
+++ b/roles/neutron/tests/runtimeclass_test.yaml
@@ -19,7 +19,10 @@
       - templates/deployment-server.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
+      bootstrap:
+        enabled: true
       network:
         backend:
           - openvswitch
@@ -97,6 +100,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
@@ -117,7 +124,10 @@
       - templates/deployment-server.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
+      bootstrap:
+        enabled: true
       network:
         backend:
           - openvswitch
@@ -125,15 +135,15 @@
           - linuxbridge
       pod:
         runtimeClassName:
-          neutron_bagpipe_bgp: kata-clh
-          neutron_bgp_dragent: kata-clh
+          bagpipe_bgp: kata-clh
+          bgp_dragent: kata-clh
           neutron_dhcp_agent: kata-clh
           neutron_l2gw_agent: kata-clh
           neutron_l3_agent: kata-clh
           neutron_lb_agent: kata-clh
           neutron_metadata_agent: kata-clh
           neutron_netns_cleanup_cron: kata-clh
-          neutron_ovn_vpn_agent: kata-clh
+          ovn_vpn_agent: kata-clh
           neutron_ovn_metadata_agent: kata-clh
           neutron_ovs_agent: kata-clh
           neutron_sriov_agent: kata-clh
@@ -142,6 +152,7 @@
           neutron_server: kata-clh
           neutron_tests: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
       manifests:
         daemonset_l2gw_agent: true
         daemonset_bagpipe_bgp: true
@@ -230,3 +241,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/nova/tests/priorityclass_test.yaml b/roles/nova/tests/priorityclass_test.yaml
index 418679f..cf23b0a 100644
--- a/roles/nova/tests/priorityclass_test.yaml
+++ b/roles/nova/tests/priorityclass_test.yaml
@@ -15,6 +15,7 @@
       - templates/statefulset-compute-ironic.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       manifests:
         cron_job_archive_deleted_rows: true
@@ -68,6 +69,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 5
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
@@ -84,6 +89,7 @@
       - templates/statefulset-compute-ironic.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       manifests:
         cron_job_archive_deleted_rows: true
@@ -103,6 +109,7 @@
           nova_compute_ironic: platform
           nova_tests: platform
           db_sync: platform
+          bootstrap: platform
     asserts:
       - template: templates/daemonset-compute.yaml
         documentIndex: 4
@@ -164,3 +171,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/nova/tests/runtimeclass_test.yaml b/roles/nova/tests/runtimeclass_test.yaml
index 178eb9c..3561a38 100644
--- a/roles/nova/tests/runtimeclass_test.yaml
+++ b/roles/nova/tests/runtimeclass_test.yaml
@@ -15,6 +15,7 @@
       - templates/statefulset-compute-ironic.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       console:
         console_kind: spice
@@ -70,6 +71,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
@@ -86,6 +91,7 @@
       - templates/statefulset-compute-ironic.yaml
       - templates/pod-rally-test.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       console:
         console_kind: spice
@@ -107,6 +113,7 @@
           nova_compute_ironic: kata-clh
           nova_tests: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
     asserts:
       - template: templates/daemonset-compute.yaml
         documentIndex: 4
@@ -168,3 +175,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh
diff --git a/roles/octavia/tests/priorityclass_test.yaml b/roles/octavia/tests/priorityclass_test.yaml
index 9808b3c..1732a9a 100644
--- a/roles/octavia/tests/priorityclass_test.yaml
+++ b/roles/octavia/tests/priorityclass_test.yaml
@@ -7,6 +7,7 @@
       - templates/deployment-housekeeping.yaml
       - templates/deployment-worker.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/daemonset-health-manager.yaml
         documentIndex: 4
@@ -28,6 +29,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.priorityClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.priorityClassName
 
   - it: should support setting a priority class
     templates:
@@ -36,6 +41,7 @@
       - templates/deployment-housekeeping.yaml
       - templates/deployment-worker.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         priorityClassName:
@@ -44,6 +50,7 @@
           octavia_housekeeping: platform
           octavia_worker: platform
           db_sync: platform
+          bootstrap: platform
     asserts:
       - template: templates/daemonset-health-manager.yaml
         documentIndex: 4
@@ -70,3 +77,8 @@
         equal:
           path: spec.template.spec.priorityClassName
           value: platform
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.priorityClassName
+          value: platform
diff --git a/roles/octavia/tests/runtimeclass_test.yaml b/roles/octavia/tests/runtimeclass_test.yaml
index c13f2bb..53f10fc 100644
--- a/roles/octavia/tests/runtimeclass_test.yaml
+++ b/roles/octavia/tests/runtimeclass_test.yaml
@@ -7,6 +7,7 @@
       - templates/deployment-housekeeping.yaml
       - templates/deployment-worker.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     asserts:
       - template: templates/daemonset-health-manager.yaml
         documentIndex: 4
@@ -28,6 +29,10 @@
         documentIndex: 3
         notExists:
           path: spec.template.spec.runtimeClassName
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        notExists:
+          path: spec.template.spec.runtimeClassName
 
   - it: should support setting a runtime class
     templates:
@@ -36,6 +41,7 @@
       - templates/deployment-housekeeping.yaml
       - templates/deployment-worker.yaml
       - templates/job-db-sync.yaml
+      - templates/job-bootstrap.yaml
     set:
       pod:
         runtimeClassName:
@@ -44,6 +50,7 @@
           octavia_housekeeping: kata-clh
           octavia_worker: kata-clh
           db_sync: kata-clh
+          bootstrap: kata-clh
     asserts:
       - template: templates/daemonset-health-manager.yaml
         documentIndex: 4
@@ -70,3 +77,8 @@
         equal:
           path: spec.template.spec.runtimeClassName
           value: kata-clh
+      - template: templates/job-bootstrap.yaml
+        documentIndex: 1
+        equal:
+          path: spec.template.spec.runtimeClassName
+          value: kata-clh