diff --git a/charts/openvswitch/Chart.yaml b/charts/openvswitch/Chart.yaml
index 3d58163..191e81c 100644
--- a/charts/openvswitch/Chart.yaml
+++ b/charts/openvswitch/Chart.yaml
@@ -9,4 +9,4 @@
 sources:
 - https://github.com/openvswitch/ovs
 - https://opendev.org/openstack/openstack-helm
-version: 0.1.19
+version: 0.1.24
diff --git a/charts/openvswitch/templates/daemonset.yaml b/charts/openvswitch/templates/daemonset.yaml
index 7984023..3a66fa5 100644
--- a/charts/openvswitch/templates/daemonset.yaml
+++ b/charts/openvswitch/templates/daemonset.yaml
@@ -58,7 +58,7 @@
 {{- $envAll := . }}
 
 {{- $serviceAccountName := "openvswitch-server" }}
-{{ tuple $envAll "vswitchd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
+{{ tuple $envAll "ovs" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -168,9 +168,19 @@
           # successfully before its marked as ready
 {{ dict "envAll" $envAll "component" "ovs" "container" "ovs_vswitch" "type" "liveness" "probeTemplate" (include "ovsvswitchlivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
 {{ dict "envAll" $envAll "component" "ovs" "container" "ovs_vswitch" "type" "readiness" "probeTemplate" (include "ovsvswitchreadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
+{{- if .Values.pod.tini.enabled }}
+          command:
+            - /tini
+            - -s
+            - --
+          args:
+            - /tmp/openvswitch-vswitchd.sh
+            - start
+{{- else }}
           command:
             - /tmp/openvswitch-vswitchd.sh
             - start
+{{- end }}
           lifecycle:
             postStart:
               exec:
diff --git a/charts/openvswitch/values.yaml b/charts/openvswitch/values.yaml
index f967c75..01aa93d 100644
--- a/charts/openvswitch/values.yaml
+++ b/charts/openvswitch/values.yaml
@@ -37,6 +37,8 @@
     node_selector_value: enabled
 
 pod:
+  tini:
+    enabled: true
   tolerations:
     openvswitch:
       enabled: false