diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data
index 074c38202e..cd488bf360 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="stx-openstack-helm"
 COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
-TIS_PATCH_VER=5
+TIS_PATCH_VER=6
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 732356a070..293967c655 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
@@ -1872,9 +1872,39 @@ data:
           labels:
             release_group: osh-openstack-horizon
   values:
+    network:
+      node_port:
+        enabled: 'true'
+        port: 31000
+    pod:
+      mounts:
+        horizon:
+          horizon:
+            # Branding directory mount
+            volumeMounts:
+              - mountPath: /opt/branding
+                name: horizon-branding
+            volumes:
+              - hostPath:
+                  path: /opt/branding
+                  type: Directory
+                name: horizon-branding
     conf:
       horizon:
         local_settings:
+          config:
+            # Region Modes
+            ss_enabled: 'False'
+            dc_mode: 'False'
+            # Security
+            https_enabled: 'False'
+            lockout_period_sec: '300'
+            lockout_retries_num: '3'
+            # Optional Services
+            enable_magnum: 'False'
+            enable_murano: 'False'
+            # Turn off domain support as we aren't using
+            keystone_multidomain_support: 'False'
           template: |
             import os
 
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 e5b3c6d5f8..9ba6cc9c58 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
@@ -1872,9 +1872,39 @@ data:
           labels:
             release_group: osh-openstack-horizon
   values:
+    network:
+      node_port:
+        enabled: 'true'
+        port: 31000
+    pod:
+      mounts:
+        horizon:
+          horizon:
+            # Branding directory mount
+            volumeMounts:
+              - mountPath: /opt/branding
+                name: horizon-branding
+            volumes:
+              - hostPath:
+                  path: /opt/branding
+                  type: Directory
+                name: horizon-branding
     conf:
       horizon:
         local_settings:
+          config:
+            # Region Modes
+            ss_enabled: 'False'
+            dc_mode: 'False'
+            # Security
+            https_enabled: 'False'
+            lockout_period_sec: '300'
+            lockout_retries_num: '3'
+            # Optional Services
+            enable_magnum: 'False'
+            enable_murano: 'False'
+            # Turn off domain support as we aren't using
+            keystone_multidomain_support: 'False'
           template: |
             import os
 
diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index 97482ad914..db54b8f4eb 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=304
+TIS_PATCH_VER=305
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
index 190fb8441c..e6f07f86f3 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Wind River Systems, Inc.
+# Copyright (c) 2018-2019 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -24,12 +24,6 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
         overrides = {
             common.HELM_NS_OPENSTACK: {
                 'images': self._get_images_overrides(),
-                'network': {
-                    'node_port': {
-                        'enabled': 'true',
-                        'port': 31000
-                    }
-                },
                 'conf': {
                     'horizon': {
                         'local_settings': {
@@ -37,27 +31,6 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
                         }
                     }
                 },
-                'pod': {
-                    'mounts': {
-                        'horizon': {
-                            'horizon': {
-                                # Branding directory mount
-                                'volumeMounts': [{
-                                    'name': 'horizon-branding',
-                                    'mountPath': '/opt/branding',
-                                }],
-                                'volumes': [{
-                                    'name': 'horizon-branding',
-                                    'hostPath':
-                                        {
-                                            'path': '/opt/branding',
-                                            'type': 'Directory'
-                                        },
-                                }],
-                            }
-                        }
-                    }
-                },
                 'endpoints': self._get_endpoints_overrides()
             }
         }
@@ -92,28 +65,13 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
 
     def _get_local_settings_config_overrides(self):
         local_settings_config = {
-            # Region Modes
-            'ss_enabled': 'False',
-            'dc_mode': 'False',
-
-            # Security
-            'https_enabled': 'False',
-            'lockout_period_sec': '300',
-            'lockout_retries_num': '3',
             'horizon_secret_key': self._get_or_generate_password(
                 self.SERVICE_NAME, common.HELM_NS_OPENSTACK,
                 'horizon_secret_key'),
 
-            # Optional Services
-            'enable_murano': 'False',
-            'enable_magnum': 'False',
-
-            # Turn off domain support as we aren't using it
-            'keystone_multidomain_support': 'False',
+            'system_region_name': self._region_name()
         }
 
-        local_settings_config.update({'system_region_name': self._region_name()})
-
         # Basic region config additions
         if self._region_config():
             openstack_host = 'controller'  # TODO(tsmith) must evaluate region functionality