diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml
index 16439f3731..cba0f25abf 100644
--- a/neutron/templates/daemonset-dhcp-agent.yaml
+++ b/neutron/templates/daemonset-dhcp-agent.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: neutron-dhcp-agent
 spec:
+  {{ if .Values.upgrades.daemonsets.dhcp_agent.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.dhcp_agent.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.dhcp_agent.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml
index 4a23b1f813..1a6752c7b4 100644
--- a/neutron/templates/daemonset-l3-agent.yaml
+++ b/neutron/templates/daemonset-l3-agent.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: neutron-l3-agent
 spec:
+  {{ if .Values.upgrades.daemonsets.l3_agent.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.l3_agent.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.l3_agent.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml
index 68a90f347b..04cc56a43b 100644
--- a/neutron/templates/daemonset-metadata-agent.yaml
+++ b/neutron/templates/daemonset-metadata-agent.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: neutron-metadata-agent
 spec:
+  {{ if .Values.upgrades.daemonsets.metadata_agent.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.metadata_agent.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.metadata_agent.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
index 65cc19033d..1aaea7dc31 100644
--- a/neutron/templates/daemonset-ovs-agent.yaml
+++ b/neutron/templates/daemonset-ovs-agent.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: ovs-agent
 spec:
+  {{ if .Values.upgrades.daemonsets.ovs_agent.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_agent.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_agent.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml
index 00858e06ae..20e3ca9c2f 100644
--- a/neutron/templates/daemonset-ovs-db.yaml
+++ b/neutron/templates/daemonset-ovs-db.yaml
@@ -18,6 +18,15 @@ kind: DaemonSet
 metadata:
   name: ovs-db
 spec:
+  {{ if .Values.upgrades.daemonsets.ovs_db.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_db.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_db.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/daemonset-ovs-vswitchd.yaml b/neutron/templates/daemonset-ovs-vswitchd.yaml
index acc2958efc..b6dd720902 100644
--- a/neutron/templates/daemonset-ovs-vswitchd.yaml
+++ b/neutron/templates/daemonset-ovs-vswitchd.yaml
@@ -18,6 +18,15 @@ kind: DaemonSet
 metadata:
   name: ovs-vswitchd
 spec:
+  {{ if .Values.upgrades.daemonsets.ovs_vswitchd.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_vswitchd.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_vswitchd.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index f3d6dac4f6..16141959d4 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -23,13 +23,13 @@ metadata:
   name: neutron-server
 spec:
   replicas: {{ .Values.replicas.server }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 2a356483a9..88e97d0768 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -38,11 +38,38 @@ images:
   pull_policy: "IfNotPresent"
 
 upgrades:
-  revision_history: 3
-  pod_replacement_strategy: RollingUpdate
-  rolling_update:
-    max_unavailable: 1
-    max_surge: 3
+  deployments:
+    revision_history: 3
+    pod_replacement_strategy: RollingUpdate
+    rolling_update:
+      max_unavailable: 1
+      max_surge: 3
+  daemonsets:
+    pod_replacement_strategy: RollingUpdate
+    dhcp_agent:
+      enabled: false
+      min_ready_seconds: 0
+      max_unavailable: 1
+    l3_agent:
+      enabled: false
+      min_ready_seconds: 0
+      max_unavailable: 1
+    metadata_agent:
+      enabled: true
+      min_ready_seconds: 0
+      max_unavailable: 1
+    ovs_agent:
+      enabled: true
+      min_ready_seconds: 0
+      max_unavailable: 1
+    ovs_db:
+      enabled: false
+      min_ready_seconds: 0
+      max_unavailable: 1
+    ovs_vswitchd:
+      enabled: false
+      min_ready_seconds: 0
+      max_unavailable: 1
 
 pod_disruption_budget:
   server:
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index a48c2e2428..824f024469 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: nova-compute
 spec:
+  {{ if .Values.upgrades.daemonsets.compute.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.compute.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.compute.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml
index adc96b7e75..6d81d9a2b8 100644
--- a/nova/templates/daemonset-libvirt.yaml
+++ b/nova/templates/daemonset-libvirt.yaml
@@ -22,6 +22,15 @@ kind: DaemonSet
 metadata:
   name: nova-libvirt
 spec:
+  {{ if .Values.upgrades.daemonsets.libvirt.enabled }}
+  minReadySeconds: {{ .Values.upgrades.daemonsets.libvirt.min_ready_seconds }}
+  updateStrategy:
+    type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.upgrades.daemonsets.libvirt.max_unavailable }}
+    {{ end }}
+  {{ end }}
   template:
     metadata:
       labels:
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index e122d1ec23..2aef9834c0 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -23,13 +23,13 @@ metadata:
   name: nova-api-metadata
 spec:
   replicas: {{ .Values.replicas.api_metadata }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index 1d314d31b5..f176c147cf 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -23,13 +23,13 @@ metadata:
   name: nova-api-osapi
 spec:
   replicas: {{ .Values.replicas.osapi }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index bad932ea46..3e8dfddc51 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -23,13 +23,13 @@ metadata:
   name: nova-conductor
 spec:
   replicas: {{ .Values.replicas.conductor }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 5b7fc6ecbf..86e5297492 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -23,13 +23,13 @@ metadata:
   name: nova-consoleauth
 spec:
   replicas: {{ .Values.replicas.consoleauth }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index e4f65f1668..26345a3c73 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -23,13 +23,13 @@ metadata:
   name: nova-scheduler
 spec:
   replicas: {{ .Values.replicas.scheduler }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+  revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
   strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
+    type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
+    {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
+      maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
+      maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
     {{ end }}
   template:
     metadata:
diff --git a/nova/values.yaml b/nova/values.yaml
index f3fb9ba02b..ff5d6bd38a 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -70,11 +70,22 @@ images:
   pull_policy: "IfNotPresent"
 
 upgrades:
-  revision_history: 3
-  pod_replacement_strategy: RollingUpdate
-  rolling_update:
-    max_unavailable: 1
-    max_surge: 3
+  deployments:
+    revision_history: 3
+    pod_replacement_strategy: RollingUpdate
+    rolling_update:
+      max_unavailable: 1
+      max_surge: 3
+  daemonsets:
+    pod_replacement_strategy: RollingUpdate
+    compute:
+      enabled: true
+      min_ready_seconds: 0
+      max_unavailable: 1
+    libvirt:
+      enabled: true
+      min_ready_seconds: 0
+      max_unavailable: 1
 
 pod_disruption_budget:
   metadata: