diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
index ab5d0c98e9..784efab68b 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
@@ -48,6 +48,10 @@ data:
       replicas:
         error_page: 2
         ingress: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ingress-0.1.0.tgz
@@ -89,6 +93,10 @@ data:
       replicas:
         error_page: 2
         ingress: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ingress-0.1.0.tgz
@@ -118,6 +126,12 @@ data:
         - type: job
           labels:
             app: rbd-provisioner
+  values:
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/rbd-provisioner-0.1.0.tgz
@@ -158,6 +172,11 @@ data:
       prometheus_mysql_exporter:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/mariadb-0.1.0.tgz
@@ -331,6 +350,10 @@ data:
     pod:
       replicas:
         api: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/keystone-0.1.0.tgz
@@ -970,6 +993,10 @@ data:
       user:
         aodh:
           uid: 0
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
     jobs:
       alarms_cleaner:
         # daily at the 35 minute mark
@@ -1070,6 +1097,11 @@ data:
         app:healthcheck:
           use: egg:oslo.middleware#healthcheck
           oslo_config_project: gnocchi
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/gnocchi-0.1.0.tgz
@@ -1110,6 +1142,10 @@ data:
       user:
         panko:
           uid: 0
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
     jobs:
       events_cleaner:
         # hourly at the 10 minute mark
@@ -1756,6 +1792,11 @@ data:
             attributes:
               controller: resource_metadata.controller
               switch: resource_metadata.switch
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ceilometer-0.1.0.tgz
diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
index 4562fe9762..8f3f47eab8 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
@@ -48,6 +48,10 @@ data:
       replicas:
         error_page: 2
         ingress: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ingress-0.1.0.tgz
@@ -89,6 +93,10 @@ data:
       replicas:
         error_page: 2
         ingress: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ingress-0.1.0.tgz
@@ -118,6 +126,12 @@ data:
         - type: job
           labels:
             app: rbd-provisioner
+  values:
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/rbd-provisioner-0.1.0.tgz
@@ -158,6 +172,11 @@ data:
       prometheus_mysql_exporter:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/mariadb-0.1.0.tgz
@@ -331,6 +350,10 @@ data:
     pod:
       replicas:
         api: 2
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/keystone-0.1.0.tgz
@@ -970,6 +993,10 @@ data:
       user:
         aodh:
           uid: 0
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
     jobs:
       alarms_cleaner:
         # daily at the 35 minute mark
@@ -1070,6 +1097,11 @@ data:
         app:healthcheck:
           use: egg:oslo.middleware#healthcheck
           oslo_config_project: gnocchi
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/gnocchi-0.1.0.tgz
@@ -1110,6 +1142,10 @@ data:
       user:
         panko:
           uid: 0
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
     jobs:
       events_cleaner:
         # hourly at the 10 minute mark
@@ -1756,6 +1792,11 @@ data:
             attributes:
               controller: resource_metadata.controller
               switch: resource_metadata.switch
+    pod:
+      affinity:
+        anti:
+          type:
+            default: requiredDuringSchedulingIgnoredDuringExecution
   source:
     type: tar
     location: http://172.17.0.1/helm_charts/ceilometer-0.1.0.tgz
diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index 293e65bcfe..be4508a9e5 100644
--- a/sysinv/sysinv/centos/build_srpm.data
+++ b/sysinv/sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=302
+TIS_PATCH_VER=303
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
index f726de5ab0..9d8d370643 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
@@ -24,6 +24,7 @@ class AodhHelm(openstack.OpenstackBaseHelm):
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
+                'pod': self._get_pod_overrides(),
                 'images': self._get_images_overrides(),
                 'conf': self._get_conf_overrides(),
                 'endpoints': self._get_endpoints_overrides()
@@ -38,6 +39,17 @@ class AodhHelm(openstack.OpenstackBaseHelm):
         else:
             return overrides
 
+    def _get_pod_overrides(self):
+        overrides = {
+            'replicas': {
+                'api': self._num_controllers(),
+                'evaluator': self._num_controllers(),
+                'listener': self._num_controllers(),
+                'notifier': self._num_controllers()
+            }
+        }
+        return overrides
+
     def _get_images_overrides(self):
         heat_image = self._operator.chart_operators[
             constants.HELM_CHART_HEAT].docker_image
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
index b756e6b50a..b69f0d1196 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
@@ -69,7 +69,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
                         'conductor': self._num_controllers(),
                         'consoleauth': self._num_controllers(),
                         'scheduler': self._num_controllers(),
-                        # set replicas for novncproxy once it's validated.
+                        'novncproxy': self._num_controllers()
                     }
                 },
                 'conf': {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/panko.py b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
index 0e0254eddd..dbbafa54ab 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/panko.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
@@ -24,6 +24,7 @@ class PankoHelm(openstack.OpenstackBaseHelm):
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
+                'pod': self._get_pod_overrides(),
                 'images': self._get_images_overrides(),
                 'endpoints': self._get_endpoints_overrides()
             }
@@ -37,6 +38,14 @@ class PankoHelm(openstack.OpenstackBaseHelm):
         else:
             return overrides
 
+    def _get_pod_overrides(self):
+        overrides = {
+            'replicas': {
+                'api': self._num_controllers()
+            }
+        }
+        return overrides
+
     def _get_images_overrides(self):
         heat_image = self._operator.chart_operators[
             constants.HELM_CHART_HEAT].docker_image
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
index 1b911de167..08453348fc 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
@@ -104,6 +104,7 @@ class RbdProvisionerHelm(base.BaseHelm):
                 "classes": classes,
                 "ephemeral_pools": ephemeral_pools,
                 "images": self._get_images_overrides(),
+                "pods": self._get_pod_overrides()
             }
         }
 
@@ -115,6 +116,14 @@ class RbdProvisionerHelm(base.BaseHelm):
         else:
             return overrides
 
+    def _get_pod_overrides(self):
+        overrides = {
+            'replicas': {
+                'rbd-provisioner': self._num_controllers()
+            }
+        }
+        return overrides
+
     def _get_images_overrides(self):
         # TODO: Remove after ceph upgrade
         # Format the name of the stx specific ceph config helper