diff --git a/.github/workflows/federation-helm.yml b/.github/workflows/federation-helm.yml
index 1350b1b..7a02490 100644
--- a/.github/workflows/federation-helm.yml
+++ b/.github/workflows/federation-helm.yml
@@ -61,8 +61,9 @@ env:
   KIND_NODE_IMAGE: kindest/node:v1.31.0
   # The chart's image refs default to the Chart.yaml appVersion. The live jobs pull the
   # public DockerHub tags at this version so the chart DEFAULTS resolve the kind-loaded images.
-  # MUST match Chart.yaml appVersion — stale on the 0.2.2 train, reconciled on 0.2.3.
-  IMAGE_TAG: '0.2.3'
+  # MUST match Chart.yaml appVersion — stale on the 0.2.2 train, reconciled on 0.2.3,
+  # stale again on 0.2.4 (the chart bumped, this did not), reconciled on 0.2.5.
+  IMAGE_TAG: '0.2.5'
   FED_IMAGE: softnetwork/softclient4es-federation
   SIDECAR_IMAGE_PREFIX: softnetwork/softclient4es   # softclient4es<N>-arrow-flight-sql
   # A pre-baked ADBC client image avoids the smoke Job's runtime pip install (air-gap). When
diff --git a/softclient4es-federation/Chart.yaml b/softclient4es-federation/Chart.yaml
index 2052c7e..ce587bf 100644
--- a/softclient4es-federation/Chart.yaml
+++ b/softclient4es-federation/Chart.yaml
@@ -31,12 +31,24 @@ type: application
 #        routing allowlist — a DDL statement carrying a JOIN reaches the
 #        materialized-view extension, not the federation JOIN planner,
 #        softclient4es-arrow#130), rolled into the federation + sidecar images.
-version: 0.3.4
+# 0.3.5: appVersion 0.2.5 — elasticsql 0.20.4 (completeness family: GROUP BY
+#        #205, window PARTITION BY #207, un-LIMITed SELECT #209 and explicit
+#        LIMIT above index.max_result_window #224 no longer truncate silently;
+#        PIT paging sorts by _doc and gates at 7.12 #197; strict
+#        whole-statement parsing #213) + extensions 0.2.4 (materialized-view
+#        error integrity: an outage is no longer reported as "does not exist"
+#        #45, a failed metadata table is no longer a quota breach #46) +
+#        arrow 0.2.5 (JOIN legs past 4,032 rows softclient4es-arrow#143, lazily
+#        streamed bounded legs #147, a writable bounded DuckDB spill directory
+#        #141, a real health probe #146, and the server images ship a default
+#        logback.xml so they no longer boot at ROOT DEBUG #138), rolled into the
+#        federation + sidecar images.
+version: 0.3.5
 # The federation application/image version this chart deploys by default.
 # Keep in sync with docker.io/softnetwork/softclient4es-federation:<tag>.
 # Verified published on DockerHub for the federation image AND all four
 # softclient4es{6,7,8,9}-arrow-flight-sql sidecar images.
-appVersion: "0.2.4"
+appVersion: "0.2.5"
 keywords:
   - elasticsearch
   - flight-sql
diff --git a/softclient4es-federation/tests/golden/default.yaml b/softclient4es-federation/tests/golden/default.yaml
index 480af55..37c1884 100644
--- a/softclient4es-federation/tests/golden/default.yaml
+++ b/softclient4es-federation/tests/golden/default.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -44,10 +44,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -60,10 +60,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
@@ -78,7 +78,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/softclient4es-federation/tests/golden/example-heterogeneous-ready.yaml b/softclient4es-federation/tests/golden/example-heterogeneous-ready.yaml
index f98a681..22754fe 100644
--- a/softclient4es-federation/tests/golden/example-heterogeneous-ready.yaml
+++ b/softclient4es-federation/tests/golden/example-heterogeneous-ready.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -84,10 +84,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -108,12 +108,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-us-east-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: us-east-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -135,12 +135,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-eu-west-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: eu-west-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -162,12 +162,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-ap-south-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: ap-south-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -189,10 +189,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -205,17 +205,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 27f05af380c7d93797c14b334f17f2eb4e42c3de14bbaafe3136be064b6f8432
+        checksum/config: f814c5bf194d000857da84ae0b4b94f77041021b26407b0879e256a5f7f1dc06
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -227,7 +227,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -359,12 +359,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-us-east-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: us-east-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -378,12 +378,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: us-east-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -397,7 +397,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -549,12 +549,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-eu-west-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: eu-west-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -568,12 +568,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: eu-west-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -587,7 +587,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -739,12 +739,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-ap-south-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: ap-south-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -758,12 +758,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: ap-south-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -777,7 +777,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -929,10 +929,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
diff --git a/softclient4es-federation/tests/golden/example-single-cluster.yaml b/softclient4es-federation/tests/golden/example-single-cluster.yaml
index c0eb60d..6705ccd 100644
--- a/softclient4es-federation/tests/golden/example-single-cluster.yaml
+++ b/softclient4es-federation/tests/golden/example-single-cluster.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -49,10 +49,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -73,12 +73,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-primary
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: primary
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -100,10 +100,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -116,17 +116,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 07f9dd1f5c02da01dd8c9c46fdd51bfe57a3266c0367511d9ee95aa816493775
+        checksum/config: 4eddee3a366f96b211e7f8fc5c3c46217c722cc447dedae7c13ec9d836a1c432
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -138,7 +138,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -240,12 +240,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-primary
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: primary
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -259,12 +259,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: primary
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -278,7 +278,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -394,10 +394,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
diff --git a/softclient4es-federation/tests/golden/example-three-region.yaml b/softclient4es-federation/tests/golden/example-three-region.yaml
index f98a681..22754fe 100644
--- a/softclient4es-federation/tests/golden/example-three-region.yaml
+++ b/softclient4es-federation/tests/golden/example-three-region.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -84,10 +84,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -108,12 +108,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-us-east-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: us-east-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -135,12 +135,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-eu-west-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: eu-west-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -162,12 +162,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-ap-south-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: ap-south-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -189,10 +189,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -205,17 +205,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 27f05af380c7d93797c14b334f17f2eb4e42c3de14bbaafe3136be064b6f8432
+        checksum/config: f814c5bf194d000857da84ae0b4b94f77041021b26407b0879e256a5f7f1dc06
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -227,7 +227,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -359,12 +359,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-us-east-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: us-east-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -378,12 +378,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: us-east-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -397,7 +397,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -549,12 +549,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-eu-west-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: eu-west-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -568,12 +568,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: eu-west-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -587,7 +587,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -739,12 +739,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-ap-south-1
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: ap-south-1
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -758,12 +758,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: ap-south-1
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -777,7 +777,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -929,10 +929,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
diff --git a/softclient4es-federation/tests/golden/ingress-tls.yaml b/softclient4es-federation/tests/golden/ingress-tls.yaml
index 97ece58..70e10b7 100644
--- a/softclient4es-federation/tests/golden/ingress-tls.yaml
+++ b/softclient4es-federation/tests/golden/ingress-tls.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -49,10 +49,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -73,12 +73,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -100,10 +100,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -116,17 +116,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 425408def0ebdaa918faefaddf3519b0f356ab6999e02daabc82b8a1e6dedba6
+        checksum/config: efa831fb157f8c40d9037ce2f518332a6d7429014630e4fb33defe62a0d74240
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -138,7 +138,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -240,12 +240,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -259,12 +259,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: prod-us
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -278,7 +278,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -362,10 +362,10 @@ kind: Ingress
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -401,10 +401,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
diff --git a/softclient4es-federation/tests/golden/secret-auth.yaml b/softclient4es-federation/tests/golden/secret-auth.yaml
index eca17eb..00e2ffe 100644
--- a/softclient4es-federation/tests/golden/secret-auth.yaml
+++ b/softclient4es-federation/tests/golden/secret-auth.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -58,10 +58,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -82,12 +82,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -109,10 +109,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -125,17 +125,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 8d6a666140859251d1b793e55a74eb7eebc88ccb0124154dbf48284675348b41
+        checksum/config: 50d761219cc3ad4854d09c55768918608bf0f94aab623aebb2124ba061111804
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -147,7 +147,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -255,12 +255,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -274,12 +274,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: prod-us
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -293,7 +293,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -433,10 +433,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
diff --git a/softclient4es-federation/tests/golden/two-sidecars.yaml b/softclient4es-federation/tests/golden/two-sidecars.yaml
index 399e99d..64ee42c 100644
--- a/softclient4es-federation/tests/golden/two-sidecars.yaml
+++ b/softclient4es-federation/tests/golden/two-sidecars.yaml
@@ -5,10 +5,10 @@ kind: ServiceAccount
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -20,10 +20,10 @@ kind: ConfigMap
 metadata:
   name: fed-softclient4es-federation-config
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -53,10 +53,10 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -77,12 +77,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -104,12 +104,12 @@ kind: Service
 metadata:
   name: fed-softclient4es-federation-prod-eu
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-eu
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -131,10 +131,10 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es
@@ -147,17 +147,17 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/component: federation
         app.kubernetes.io/part-of: softclient4es
       annotations:
         # Roll the federation Pod whenever the rendered servers ConfigMap changes
         # (add/remove/edit a sidecar) so `helm upgrade` actually takes effect.
-        checksum/config: 56a78ffab49daeae05c4347d45f70b7a8c30ca63eed9df798714f3146dc161da
+        checksum/config: 4301553f05eaeaddc68ed4ebb4deaef0eb3b2d822a89d770fe49c86342921f7d
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -169,7 +169,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.4"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -283,12 +283,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-prod-us
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-us
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -302,12 +302,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: prod-us
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -321,7 +321,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -447,12 +447,12 @@ kind: Deployment
 metadata:
   name: fed-softclient4es-federation-prod-eu
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
     app.kubernetes.io/component: sidecar
     softclient4es.app/sidecar: prod-eu
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: softclient4es
 spec:
@@ -466,12 +466,12 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: softclient4es-federation-0.3.4
+        helm.sh/chart: softclient4es-federation-0.3.5
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
         app.kubernetes.io/component: sidecar
         softclient4es.app/sidecar: prod-eu
-        app.kubernetes.io/version: "0.2.4"
+        app.kubernetes.io/version: "0.2.5"
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: softclient4es
     spec:
@@ -485,7 +485,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sidecar
-          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.4"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.5"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -611,10 +611,10 @@ kind: Pod
 metadata:
   name: fed-softclient4es-federation-test-catalogs
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.4
+    helm.sh/chart: softclient4es-federation-0.3.5
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.4"
+    app.kubernetes.io/version: "0.2.5"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es