diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index 2df0b268158..6d694e0e96f 100644
--- a/helm/hpcc/Chart.yaml
+++ b/helm/hpcc/Chart.yaml
@@ -6,9 +6,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 9.0.110-rc1
+version: 9.0.110
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 
-appVersion: 9.0.110-rc1
+appVersion: 9.0.110
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index b56b1041e41..92cdf95adaa 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1314,7 +1314,7 @@ kind: Service
 metadata:
   name: {{ $lvars.serviceName | quote }}
   labels:
-    helmVersion: 9.0.110-rc1
+    helmVersion: 9.0.110
     {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }}
 {{- if $lvars.labels }}
 {{ toYaml $lvars.labels | indent 4 }}
diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml
index 90d11202040..d473bd25ca8 100644
--- a/helm/hpcc/templates/dafilesrv.yaml
+++ b/helm/hpcc/templates/dafilesrv.yaml
@@ -50,7 +50,7 @@ spec:
       labels:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
         server: {{ .name | quote }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
       annotations:
         checksum/config: {{ $configSHA }}
     spec:
diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml
index f848dbd9ad0..862bcf4e5ef 100644
--- a/helm/hpcc/templates/dali.yaml
+++ b/helm/hpcc/templates/dali.yaml
@@ -82,7 +82,7 @@ spec:
         run: {{ $dali.name | quote }}
         server: {{ $dali.name | quote }}
         app: dali
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml
index 1bca79102b6..0c8b35be89c 100644
--- a/helm/hpcc/templates/dfuserver.yaml
+++ b/helm/hpcc/templates/dfuserver.yaml
@@ -56,7 +56,7 @@ spec:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
         run: {{ .name | quote }}
         accessDali: "yes"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index 3ea4216b17a..8daa96872a3 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -58,7 +58,7 @@ data:
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.0.110-rc1
+            helmVersion: 9.0.110
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -135,7 +135,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index 8913ab1b755..9da31b138f3 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -57,7 +57,7 @@ data:
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.0.110-rc1
+            helmVersion: 9.0.110
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -142,7 +142,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index 3ec59dc3321..d382ba9d2cf 100644
--- a/helm/hpcc/templates/eclscheduler.yaml
+++ b/helm/hpcc/templates/eclscheduler.yaml
@@ -64,7 +64,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: "no"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 93c082d32f0..902342a3887 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -117,7 +117,7 @@ spec:
         server: {{ .name | quote }}
         accessDali: "yes"
         app: {{ $application }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
         {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml
index 2b104851f0e..a948b9b53c6 100644
--- a/helm/hpcc/templates/localroxie.yaml
+++ b/helm/hpcc/templates/localroxie.yaml
@@ -70,7 +70,7 @@ spec:
         server: {{ $servername | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
diff --git a/helm/hpcc/templates/localroxie.yaml.fixed b/helm/hpcc/templates/localroxie.yaml.fixed
new file mode 100644
index 00000000000..cd5ca49bbbf
--- /dev/null
+++ b/helm/hpcc/templates/localroxie.yaml.fixed
@@ -0,0 +1,161 @@
+{{/*
+
+---  DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ----
+  
+##############################################################################
+
+    HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+##############################################################################
+
+*/}}
+{{/*
+localroxie configmap
+Pass in dict with root and me
+*/}}
+{{- define "hpcc.localroxieConfigMap" }}
+apiVersion: v1
+metadata:
+  name: {{ .me.name }}-configmap
+data:
+  {{ .me.name }}.yaml:
+    version: 1.0
+    roxie:
+{{ toYaml (omit .me "logging" "tracing" "env") | indent 6 }}
+{{-  include "hpcc.generateLoggingConfig" . | indent 6 }}
+{{-  include "hpcc.generateTracingConfig" . | indent 6 }}
+{{   include "hpcc.generateVaultConfig" . | indent 6 }}
+    global:
+{{   include "hpcc.generateGlobalConfigMap" .root | indent 6 }}
+{{- end -}}{{/* define "hpcc.localroxieConfigMap */}}
+
+{{  range $roxie := $.Values.roxie -}}
+{{-  if not $roxie.disabled  -}}
+{{-   $env := concat ($.Values.global.env | default list) (.env | default list) -}}
+{{-   $secretsCategories := list "system" "eclUser" "ecl" "storage" }}
+{{-   $enginePlaneDetails := dict -}}
+{{-   $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}}
+{{-   $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "env" $env }}
+{{-   $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap" "component" "roxie" "excludeKeys" "global")) }}
+{{-   include "hpcc.checkDefaultStoragePlane" $commonCtx }}
+{{-   $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }}
+{{-   if $singleNode -}}
+{{-    $localAgent := ((hasKey $roxie "localAgent") | ternary $roxie.localAgent true) -}}
+{{-    $name := $roxie.name -}}
+{{-    $servername := printf "%s-server" $roxie.name -}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $roxie.name | quote }}
+spec:
+  replicas: {{ $roxie.replicas | default 1 }}
+  selector:
+    matchLabels:
+      run: {{ $roxie.name | quote }}
+      server: {{ $servername | quote }}
+  template:
+    metadata:
+      labels:
+        run: {{ $roxie.name | quote }}
+        server: {{ $servername | quote }}
+        accessDali: "yes"
+        accessEsp: "yes"
+<<<<<<< HEAD
+        helmVersion: 9.0.110
+{{-    include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
+{{-    if hasKey . "labels" }}
+{{      toYaml .labels | indent 8 }}
+{{-    end }}
+=======
+        helmVersion: 9.0.110
+        {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
+{{- if hasKey . "labels" }}
+{{ toYaml .labels | indent 8 }}
+{{- end }}
+>>>>>>> origin/candidate-9.6.x
+      annotations:
+        checksum/config: {{ $configSHA }}
+{{-    include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
+    spec:
+{{-    include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $roxie.name "target" $roxie.name "type" "roxie") | indent 6 }}
+      serviceAccountName: "hpcc-default"
+      initContainers:
+{{-    include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }}
+{{-    include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
+      containers:
+      - name: {{ $roxie.name | quote }}
+        workingDir: /var/lib/HPCCSystems
+        command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] 
+        args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }}
+                {{ include "hpcc.configArg" $roxie }},
+                {{ include "hpcc.daliArg" (dict "root" $ "component" "Local Roxie" "optional" false) }},
+                "--server=true", 
+                "--localAgent={{ $localAgent }}",
+                "--resolveLocally=false"
+              ]
+        env:
+{{     include "hpcc.mergeEnvironments" $env | indent 8 -}}
+        - name: "SENTINEL"
+          value: "/tmp/{{ $roxie.name }}.sentinel"
+{{-    $local := dict "first" true }}
+{{-    range $service := $roxie.services }}
+{{-     if ne (int $service.servicePort)  0 }}
+{{-      if $local.first }}
+{{-       $_ := set $local "first" false }}
+        ports:
+{{-      end }}
+        - name: {{ $service.name }}
+          containerPort: {{ $service.servicePort }}
+{{-     end }}
+{{-    end }}
+{{-    include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{-    include "hpcc.addResources" (dict "me" $roxie.resources "root" $) | indent 8 }}
+{{     include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
+        volumeMounts:
+{{     include "hpcc.addConfigMapVolumeMount" . | indent 8 }}
+{{     include "hpcc.addVolumeMounts" $commonCtx | indent 8 }}
+{{-    include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }}
+{{     include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }}
+{{     include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 8 }}
+{{     include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 8 }}
+{{     include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 8 }}
+      volumes:
+{{     include "hpcc.addConfigMapVolume" . | indent 6 }}
+{{     include "hpcc.addVolumes" $commonCtx | indent 6 }}
+{{     include "hpcc.addSecretVolumes" $commonCtx | indent 6 }}
+{{     include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }}
+{{     include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 6 }}
+{{     include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 6 }}
+{{     include "hpcc.addUDPCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 6 }}
+---
+{{-    range $service := $roxie.services }}
+{{-     if ne (int $service.servicePort)  0 }}
+{{       include "hpcc.addService" ( dict "root" $ "name" $service.name "service" $service "selector" $servername "defaultPort" $service.servicePort ) }}
+---
+{{-     end }}
+{{-    end }}
+kind: ConfigMap 
+{{     include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap")) }}
+---
+{{     include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" false) }}
+{{     include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" true "includeRemote" true) }}
+{{     include "hpcc.addUDPCertificate" (dict "root" $ "name" $roxie.name "component" "localudpkey") }}
+---
+{{     include "hpcc.addEgress" $commonCtx }}
+
+{{-   end }}{{/* if singleNode */}}
+{{-  end }}{{/* if not disabled */}}
+{{- end }}{{/* range */}}
diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
index 736c2f4b48f..8d02f582dd7 100644
--- a/helm/hpcc/templates/roxie.yaml
+++ b/helm/hpcc/templates/roxie.yaml
@@ -120,7 +120,7 @@ spec:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
         run: {{ $commonCtx.toponame | quote }}
         roxie-cluster: {{ $roxie.name | quote }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
 {{- end }}
@@ -180,7 +180,7 @@ kind: Service
 metadata:
   name: {{ $commonCtx.toponame | quote }}
   labels:
-    helmVersion: 9.0.110-rc1
+    helmVersion: 9.0.110
     {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 spec:
   ports:
@@ -242,7 +242,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
@@ -347,7 +347,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
 {{- end }}
diff --git a/helm/hpcc/templates/roxie.yaml.fixed b/helm/hpcc/templates/roxie.yaml.fixed
new file mode 100644
index 00000000000..ecf209a4ec3
--- /dev/null
+++ b/helm/hpcc/templates/roxie.yaml.fixed
@@ -0,0 +1,479 @@
+{{/*
+
+---  DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ----
+  
+##############################################################################
+
+    HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+##############################################################################
+
+*/}}
+
+{{/*
+roxie configmap
+Pass in dict with root and me
+*/}}
+{{- define "hpcc.roxieConfigMap" -}}
+apiVersion: v1
+metadata:
+  name: {{ .me.name }}-configmap
+data:
+  {{ .me.name }}.yaml:
+    version: 1.0
+    roxie:
+{{-  $root := .root -}}
+{{-  $component := .me }}
+      services:
+{{-  range $service := .me.services }}
+      - name: {{ $service.name }}
+{{    toYaml (omit $service "tls" "name") | indent 8 }}
+{{-   if ne (int $service.servicePort) 0 }}
+{{-    include "hpcc.addTLSServiceEntries" (dict "root" $root "service" $service "component" $component "visibility" $service.visibility "remoteClients" $service.remoteClients "trustClients" $service.trustClients "includeTrustedPeers" true "incluedRoxieAndEspServices" true) | indent 6 }}
+{{-   end }}
+{{-  end }}
+{{   toYaml ( omit .me "logging" "tracing" "topoServer" "encryptInTransit" "env" "services") | indent 6 }}
+      numChannels: {{ .numChannels }}
+      topologyServers: "{{ .toponame }}:{{ .topoport }}"
+      heartbeatInterval: {{ .heartbeatInterval }}
+      resolveLocally: false
+{{-  $mtlsEnabled := (eq (include "hpcc.isMtlsEnabled" (dict "root" .root)) "true") -}}
+{{/* By default use encryption if local certificates are enabled, but allow it to be turned off via roxie .encryptInTransit value */}}
+{{-  if (hasKey .me "encryptInTransit") -}}
+{{-   if and (.me.encryptInTransit) (not $mtlsEnabled) -}}
+{{-    $_ := fail (printf "Roxie %s encryptInTransit requires local cert-manager configuration." .me.name ) }}
+{{-   end }}
+      encryptInTransit: {{ .me.encryptInTransit }}
+{{   else }}
+      encryptInTransit: {{ $mtlsEnabled }}
+{{   end -}}
+{{-  include "hpcc.generateLoggingConfig" (dict "root" .root "me" .me) | indent 6 }}
+{{- include "hpcc.generateTracingConfig" (dict "root" .root "me" .me) | indent 6 }}
+{{   include "hpcc.generateVaultConfig" . | indent 6 }}
+    global:
+{{   include "hpcc.generateGlobalConfigMap" .root | indent 6 }}
+{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}}
+
+{{- define "hpcc.roxieTopoConfigMap" -}}
+apiVersion: v1
+metadata:
+  name: {{ .toponame }}-configmap
+data:
+  {{ .toponame }}.yaml:
+    version: 1.0
+    toposerver:
+{{   toYaml ( omit .toposerver "logging" "tracing" "env") | indent 6 }}
+{{-  include "hpcc.generateLoggingConfig" (dict "root" .root "me" .toposerver) | indent 6 }}
+{{-  include "hpcc.generateTracingConfig" (dict "root" .root "me" .toposerver) | indent 6 }}
+    global:
+{{   include "hpcc.generateGlobalConfigMap" .root | indent 6 }}
+{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}}
+
+{{  range $roxie := $.Values.roxie -}}
+{{-  if not $roxie.disabled -}}
+{{-   $env := concat ($.Values.global.env | default list) (.env | default list) -}}
+{{-   $secretsCategories := list "system" "eclUser" "ecl" "storage" }}
+{{-   $toposerver := ($roxie.topoServer | default dict) -}}
+{{-   $enginePlaneDetails := dict -}}
+{{-   $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}}
+{{-   $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "toposerver" $toposerver "env" $env }}
+{{-   $_ := set $commonCtx "toponame" (printf "%s-toposerver" $roxie.name) -}}
+{{-   $_ := set $commonCtx "numChannels" ($roxie.numChannels | int | default 1) -}}
+{{-   $_ := set $commonCtx "topoport" ($toposerver.port | int | default 9004) -}}
+{{-   $_ := set $commonCtx "heartbeatInterval" ($toposerver.heartbeatInterval | int | default 10000) -}}
+{{-   $_ := set $toposerver "name" $commonCtx.toponame -}}
+{{-   $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap" "component" "roxie" "excludeKeys" "global")) }}
+{{-   $topoconfigSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap" "component" "toposerver" "excludeKeys" "global")) }}
+{{-   include "hpcc.checkDefaultStoragePlane" $commonCtx }}
+{{-   $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }}
+{{-   if not $singleNode -}}
+{{-    $servername := printf "%s-server" $roxie.name -}}
+{{-    $udpkeyname := $roxie.name -}}
+{{-    range $service := $roxie.services }}
+{{-     range $remoteClient := $service.remoteClients }}
+  {{     include "hpcc.addExternalRemoteClientCertificate" (dict "root" $ "client" $remoteClient.name "organization" $remoteClient.organization "instance" $service.name "component" "roxie" "visibility" $service.visibility "secretTemplate" $remoteClient.secretTemplate) }}
+{{-     end }}
+{{-     if ne (int $service.servicePort)  0 }}
+{{-      $_ := set $service "port" $service.servicePort }} 
+{{-     end }}
+{{-    end }}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $commonCtx.toponame | quote }}
+spec:
+  replicas: {{ $toposerver.replicas | default 1 }}
+  selector:
+    matchLabels:
+      run: {{ $commonCtx.toponame | quote }}
+  template:
+    metadata:
+      labels:
+{{-    include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
+        run: {{ $commonCtx.toponame | quote }}
+        roxie-cluster: {{ $roxie.name | quote }}
+<<<<<<< HEAD
+        helmVersion: 9.0.110
+{{-    if hasKey $.Values.global "metrics" }}
+{{-     include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
+{{-    end }}
+{{-    if hasKey $toposerver "labels" }}
+{{      toYaml $toposerver.labels | indent 8 }}
+{{-    end }}
+=======
+        helmVersion: 9.0.110
+{{- if hasKey $.Values.global "metrics" }}
+ {{- include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
+{{- end }}
+{{- if hasKey $toposerver "labels" }}
+{{ toYaml $toposerver.labels | indent 8 }}
+{{- end }}
+>>>>>>> origin/candidate-9.6.x
+      annotations:
+        checksum/config: {{ $topoconfigSHA }}
+{{-    include "hpcc.generateAnnotations" (dict "root" $commonCtx.root "me" $toposerver) | indent 8 }}
+{{-    if hasKey $.Values.global "metrics" }}
+{{-     include "hpcc.addPrometheusScrapeAnnotations"  $.Values.global.metrics | nindent 8 }}
+{{-    end }}
+    spec:
+{{-    include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $commonCtx.toponame "target" $roxie.name "type" "roxie") | indent 6 }}
+      serviceAccountName: "hpcc-default"
+{{-    include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
+      containers:
+      - name: {{ $commonCtx.toponame | quote }}
+{{     include "hpcc.addSentinelProbes" $toposerver | indent 8 }}
+{{-    include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{-    $defaultResources := dict "cpu" "500m" "memory" "200Mi" }}
+{{-    include "hpcc.addResources" (dict "me" .topoResources "defaults" $defaultResources "root" $) | indent 8 }}
+{{     include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
+        workingDir: /var/lib/HPCCSystems
+        command: [ {{ include "hpcc.componentCommand" (dict "me" $toposerver "root" $ "process" "toposerver") }} ] 
+        args: [ {{- include "hpcc.componentStartArgs" (dict "me" $toposerver "root" $ "process" "toposerver") | nindent 16 }}
+                {{ include "hpcc.configArg" $toposerver }}
+              ]
+        env:
+{{     include "hpcc.mergeEnvironments" $env | indent 8 -}}
+        - name: "SENTINEL"
+          value: "/tmp/{{ $commonCtx.toponame }}.sentinel"
+        volumeMounts:
+{{     include "hpcc.addConfigMapVolumeMount" $toposerver | indent 8 }}
+{{     include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 8 }}
+      volumes:
+{{     include "hpcc.addConfigMapVolume" $toposerver | indent 6 }}
+{{     include "hpcc.addCertificateVolume" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 6 }}
+
+---
+{{     include "hpcc.addCertificate" (dict "root" $ "name" $commonCtx.toponame "servicename" $commonCtx.toponame "component" "topo" "external" false) }}
+{{     include "hpcc.addUDPCertificate" (dict "root" $ "name" $udpkeyname "component" "udpkey") }}
+
+---
+{{-    range $service := $roxie.services }}
+{{-     if ne (int $service.servicePort)  0 }}
+{{       include "hpcc.addService" ( dict "root" $ "name" $service.name "service" $service "selector" $servername "defaultPort" $service.servicePort) }}
+---
+{{-     end }}
+{{-    end }}
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $commonCtx.toponame | quote }}
+  labels:
+<<<<<<< HEAD
+    helmVersion: 9.0.110
+{{-    include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
+=======
+    helmVersion: 9.0.110
+    {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
+>>>>>>> origin/candidate-9.6.x
+spec:
+  ports:
+  - port: {{ $commonCtx.topoport  }}
+    protocol: TCP
+    targetPort: {{ $commonCtx.topoport }}
+  selector:
+    run: {{ $commonCtx.toponame | quote }}
+  clusterIP: None # Headless service
+---
+
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ printf "%s-internal-traffic" $roxie.name }}
+spec:
+  podSelector:
+    matchLabels:
+      roxie-cluster: {{ $roxie.name | quote }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          roxie-cluster: {{ $roxie.name | quote }}
+  egress:
+  - to:
+    - podSelector:
+        matchLabels:
+          roxie-cluster: {{ $roxie.name | quote }}
+
+---
+kind: ConfigMap 
+{{     include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap")) }}
+---
+kind: ConfigMap 
+{{     include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap")) }}
+---
+
+{{-    $_ := set $commonCtx "instanceNames" list -}}
+{{     if $roxie.serverReplicas -}}
+{{      $_ := set $commonCtx "instanceNames" (list $servername) -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $servername | quote }}
+spec:
+  replicas: {{ $roxie.serverReplicas }}
+  selector:
+    matchLabels:
+      run: {{ $servername | quote }}
+  template:
+    metadata:
+      labels:
+        run: {{ $servername | quote }}
+        server: {{ $roxie.name | quote }}
+        roxie-cluster: {{ $roxie.name | quote }}
+        accessDali: "yes"
+        accessEsp: "yes"
+<<<<<<< HEAD
+        helmVersion: 9.0.110
+{{-     include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }}
+{{-     if hasKey $.Values.global "metrics" }}
+{{-      include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
+{{-     end }}
+{{-     if hasKey $roxie "labels" }}
+{{       toYaml $roxie.labels | indent 8 }}
+{{-     end }}
+=======
+        helmVersion: 9.0.110
+        {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }}
+{{- if hasKey $.Values.global "metrics" }}
+ {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
+{{- end }}
+{{- if hasKey $roxie "labels" }}
+{{ toYaml $roxie.labels | indent 8 }}
+{{- end }}
+>>>>>>> origin/candidate-9.6.x
+      annotations:
+        checksum/config: {{ $configSHA }}
+{{-     include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
+{{-     if hasKey $.Values.global "metrics" }}
+{{-      include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }}
+{{-     end }}
+{{-     if hasKey $roxie "annotations" }}
+{{       toYaml $roxie.annotations | indent 8 }}
+{{-     end }}
+    spec:
+{{-     include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $servername "target" $roxie.name "type" "roxie") | indent 6 }}
+      serviceAccountName: "hpcc-default"
+      initContainers:
+{{-     include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }}
+{{-     include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
+      terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }}
+      containers:
+      - name: {{ $servername | quote }}
+        workingDir: /var/lib/HPCCSystems
+        command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] 
+        args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }}
+                {{ include "hpcc.daliArg" (dict "root" $ "component" "Roxie" "optional" false) }},
+                "--server=true" 
+              ]
+        env:
+{{      include "hpcc.mergeEnvironments" $env | indent 8 -}}
+        - name: "SENTINEL"
+          value: "/tmp/{{ $roxie.name }}.sentinel"
+{{-     $local := dict "first" true }}
+{{-     range $service := $roxie.services }}
+{{-      if ne (int $service.servicePort)  0 }}
+{{-       if $local.first }}
+{{- $_ := set $local "first" false }}
+        ports:
+{{-       end }}
+        - name: {{ $service.name }}
+          containerPort: {{ $service.servicePort }}
+{{-      end }}
+{{-     end }}
+        lifecycle:
+          preStop:
+            exec:
+              command: ["testsocket", ".", "control:closedown"]        
+{{      include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
+{{      include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
+{{-     include "hpcc.addResources" (dict "me"  ($roxie.serverResources | default $roxie.resources) "root" $) | indent 8 }}
+{{      include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
+        volumeMounts:
+{{      include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }}
+{{      include "hpcc.addVolumeMounts" $commonCtx | indent 8 }}
+{{      include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }}
+{{      include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }}
+{{      include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-server" "name" $servername "external" false) | indent 8 }}
+{{      include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }}
+{{      include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }}
+      volumes:
+{{      include "hpcc.addConfigMapVolume" $roxie | indent 6 }}
+{{      include "hpcc.addVolumes" $commonCtx | indent 6 }}
+{{      include "hpcc.addSecretVolumes" $commonCtx | indent 6 }}
+{{      include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }}
+{{      include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-server" "name" $servername "external" false) | indent 6 }}
+{{      include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }}
+{{      include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }}
+
+---
+{{      include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" false) }}
+{{      include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" true "includeRemote" true) }}
+---
+{{     end -}}{{/* if serverReplicas */}}
+
+{{- $agentPublicCertName := printf "%s-agent" $roxie.name }}
+{{     include "hpcc.addCertificate" (dict "root" $ "name" $agentPublicCertName "services" $roxie.services "component" "roxie-agent" "external" true "includeRemote" true) }}
+
+{{     range $c, $e := until ($commonCtx.numChannels|int) -}}
+{{- $channel := add $c 1 -}}
+{{- $name := printf "%s-agent-%d" $roxie.name $channel }}
+{{- $_ := set $commonCtx "instanceNames" (append $commonCtx.instanceNames $name) }}
+
+{{      include "hpcc.addCertificate" (dict "root" $ "name" $name "services" $roxie.services "component" "roxie-agent" "external" false) }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $name | quote}}
+spec:
+  replicas: {{ (hasKey $roxie "replicas") | ternary $roxie.replicas 1 }}
+  selector:
+    matchLabels:
+      run: {{ $name | quote}}
+  template:
+    metadata:
+      labels:
+{{-     include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-agent" "name" "roxie" "instance" $name) | indent 8 }}
+        run: {{ $name | quote}}
+{{-     if not $roxie.serverReplicas }}        
+        server: {{ $servername | quote }}
+{{-     end }}
+        roxie-cluster: {{ $roxie.name | quote }}
+        accessDali: "yes"
+        accessEsp: "yes"
+<<<<<<< HEAD
+        helmVersion: 9.0.110
+{{-     if hasKey $.Values.global "metrics" }}
+{{-      include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
+{{-     end }}
+{{-     if hasKey $roxie "labels" }}
+{{       toYaml $roxie.labels | indent 8 }}
+{{-     end }}
+=======
+        helmVersion: 9.0.110
+{{- if hasKey $.Values.global "metrics" }}
+ {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
+{{- end }}
+{{- if hasKey $roxie "labels" }}
+{{ toYaml $roxie.labels | indent 8 }}
+{{- end }}
+>>>>>>> origin/candidate-9.6.x
+      annotations:
+        checksum/config: {{ $configSHA }}
+{{-     include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
+{{-     if hasKey $.Values.global "metrics" }}
+{{-      include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }}
+{{-     end }}
+    spec:
+{{-     include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $name "target" $roxie.name "type" "roxie") | indent 6 }}
+      serviceAccountName: "hpcc-default"
+      initContainers:
+{{-     include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }}
+{{-     include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
+      terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }}
+      containers:
+      - name: {{ $name | quote}}
+        workingDir: /var/lib/HPCCSystems
+        command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] 
+        args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }}
+                {{ include "hpcc.configArg" $roxie }},
+                {{ include "hpcc.daliArg" (dict "root" $ "component" "Roxie" "optional" false) }},
+                "--channels={{ $channel }}", 
+                "--server={{ not $roxie.serverReplicas }}",
+              ]
+        env:
+{{      include "hpcc.mergeEnvironments" $env | indent 8 -}}
+        - name: "SENTINEL"
+          value: "/tmp/{{ $roxie.name }}.sentinel"
+{{-     if not $roxie.serverReplicas }}
+{{- $local := dict "first" true }}
+{{-      range $service := $roxie.services }}
+{{-       if ne (int $service.servicePort)  0 }}
+{{-        if $local.first }}
+{{- $_ := set $local "first" false }}
+        ports:
+{{-        end }}
+        - name: {{ $service.name }}
+          containerPort: {{ $service.servicePort }}
+{{-       end }}
+{{-      end }}
+        lifecycle:
+          preStop:
+            exec:
+              command: ["testsocket", ".", "control:closedown"]
+{{       include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
+{{-     end }}{{/* not serverReplicas */}}
+{{      include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
+{{-     include "hpcc.addResources" (dict "me" ($roxie.channelResources | default $roxie.resources) "root" $) | indent 8 }}
+{{      include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
+        volumeMounts:
+{{      include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }}
+{{      include "hpcc.addVolumeMounts" $commonCtx | indent 8 }}
+{{      include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }}
+{{      include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }}
+{{-     if not $roxie.serverReplicas }}
+
+{{       include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 8 }}
+{{       include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }}
+{{       include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }}
+{{-     end }}{{/* not serverReplicas */}}
+
+      volumes:
+{{      include "hpcc.addConfigMapVolume" $roxie | indent 6 }}
+{{      include "hpcc.addVolumes" $commonCtx | indent 6 }}
+{{      include "hpcc.addSecretVolumes" $commonCtx | indent 6 }}
+{{      include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }}
+{{-     if not $roxie.serverReplicas }}
+{{       include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 6 }}
+{{       include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }}
+{{       include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }}
+{{-     end }}{{/* not serverReplicas */}}
+---
+
+{{-    end }}
+{{-   end }}{{/* if not singlenode */}}
+---
+{{    include "hpcc.addEgress" (dict "root" $ "me" $roxie "labels" $commonCtx.instanceNames) }}
+{{-   if hasKey . "hpa" }}
+{{-    include "hpcc.addHorizontalPodAutoscaler" (dict "name" $roxie.name "kind" "Deployment" "hpa" $roxie.hpa) }}
+{{-   end }}
+{{-  end }}{{/* if not disabled */}}
+{{- end }}{{/* range */}}
+
diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml
index 4dda18d68fa..6eed8cef2c0 100644
--- a/helm/hpcc/templates/sasha.yaml
+++ b/helm/hpcc/templates/sasha.yaml
@@ -52,7 +52,7 @@ spec:
         run: {{ $serviceName | quote }}
         server: {{ $serviceName | quote }}
         accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
 {{- if hasKey $sasha "labels" }}
 {{ toYaml $sasha.labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml
index a65d77713c3..f0fe84994e8 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -82,7 +82,7 @@ data:
           labels:
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.0.110-rc1
+            helmVersion: 9.0.110
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }}
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
@@ -147,7 +147,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thormanager"
-            helmVersion: 9.0.110-rc1
+            helmVersion: 9.0.110
             instance: "_HPCC_JOBNAME_"
             job: "_HPCC_JOBNAME_"
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }}
@@ -214,7 +214,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thorworker"
-            helmVersion: 9.0.110-rc1
+            helmVersion: 9.0.110
             instance: "_HPCC_JOBNAME_"
             job: "_HPCC_JOBNAME_"
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }}
@@ -347,7 +347,7 @@ spec:
         accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
         app: "thor"
         component: "thor-eclagent"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
         instance: {{ $commonCtx.eclAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
@@ -412,7 +412,7 @@ spec:
         accessEsp: "no"
         app: "thor"
         component: "thor-thoragent"
-        helmVersion: 9.0.110-rc1
+        helmVersion: 9.0.110
         instance: {{ $commonCtx.thorAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
diff --git a/version.cmake b/version.cmake
index ff5c11b901d..97f529d8619 100644
--- a/version.cmake
+++ b/version.cmake
@@ -6,7 +6,7 @@ set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 9 )
 set ( HPCC_MINOR 0 )
 set ( HPCC_POINT 110 )
-set ( HPCC_MATURITY "rc" )
+set ( HPCC_MATURITY "release" )
 set ( HPCC_SEQUENCE 1 )
-set ( HPCC_TAG_TIMESTAMP "2024-05-17T17:04:30Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-05-22T17:13:34Z" )
 ###