diff --git a/.github/scripts/deploy-es.sh b/.github/scripts/deploy-es.sh
index 2b13c62..f6ad808 100755
--- a/.github/scripts/deploy-es.sh
+++ b/.github/scripts/deploy-es.sh
@@ -50,6 +50,18 @@ if [ "${#VERSIONS[@]}" -gt "${#NAMES[@]}" ]; then
   exit 1
 fi
 
+# Pre-pull the ES images on the host and load them into the kind cluster: the node's
+# containerd would otherwise pull from docker.elastic.co in-cluster, and the ~1.4 GB
+# ES 8/9 images repeatedly hit ImagePullBackOff inside the 300s wait on GitHub runners.
+# The Deployment's tagged image + default IfNotPresent then uses the loaded copy, no pull.
+KIND_CLUSTER="$(kind get clusters | head -n 1)"
+for v in $(printf '%s\n' "${VERSIONS[@]}" | sort -u); do
+  image="$(es_image "$v")"
+  echo "Pre-pulling ${image} and loading it into kind cluster '${KIND_CLUSTER}'"
+  docker pull "$image"
+  kind load docker-image "$image" --name "$KIND_CLUSTER"
+done
+
 deploy_one() {
   local name="$1" version="$2" image
   image="$(es_image "$version")"
diff --git a/.github/workflows/federation-helm.yml b/.github/workflows/federation-helm.yml
index 1c39bff..caf3ef4 100644
--- a/.github/workflows/federation-helm.yml
+++ b/.github/workflows/federation-helm.yml
@@ -61,7 +61,7 @@ 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.
-  IMAGE_TAG: '0.2.0'
+  IMAGE_TAG: '0.2.1'
   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
@@ -206,6 +206,10 @@ jobs:
             license: true
     steps:
       - uses: actions/checkout@v4
+      - name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          df -h /
       - name: Set vm.max_map_count (Elasticsearch requirement)
         run: sudo sysctl -w vm.max_map_count=262144
       - name: Skip if example missing (Story 16.4 not merged)
@@ -323,6 +327,10 @@ jobs:
         es: [6, 7, 8, 9]
     steps:
       - uses: actions/checkout@v4
+      - name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          df -h /
       - name: Set vm.max_map_count (Elasticsearch requirement)
         run: sudo sysctl -w vm.max_map_count=262144
       - name: Set up Helm
@@ -370,6 +378,10 @@ jobs:
         backend: [raw-secret, sealed-secrets]
     steps:
       - uses: actions/checkout@v4
+      - name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          df -h /
       - name: Set vm.max_map_count (Elasticsearch requirement)
         run: sudo sysctl -w vm.max_map_count=262144
       - name: Set up Helm
@@ -425,6 +437,10 @@ jobs:
     if: ${{ needs.image-availability.outputs.images_published == 'true' }}
     steps:
       - uses: actions/checkout@v4
+      - name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          df -h /
       - name: Set vm.max_map_count (Elasticsearch requirement)
         run: sudo sysctl -w vm.max_map_count=262144
       - name: Skip if examples missing or no Pro test license (FACT C + FACT F)
@@ -499,6 +515,10 @@ jobs:
     if: ${{ needs.image-availability.outputs.images_published == 'true' }}
     steps:
       - uses: actions/checkout@v4
+      - name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          df -h /
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with: { version: "${{ env.HELM_VERSION }}" }
diff --git a/softclient4es-federation/Chart.yaml b/softclient4es-federation/Chart.yaml
index 340fa3f..cbb3686 100644
--- a/softclient4es-federation/Chart.yaml
+++ b/softclient4es-federation/Chart.yaml
@@ -10,13 +10,15 @@ type: application
 # 0.2.0: per-ES-version sidecars + federation servers ConfigMap (Story 16.2).
 # 0.3.0: Kubernetes Secrets (key-name contract + per-key override + envFrom),
 #        Secret-backed federation→sidecar creds (CONFIG_FORCE_*), TLS/Ingress (Story 16.3).
-version: 0.3.0
+# 0.3.1: appVersion 0.2.1 — arrow-extensions JoinExtension priority fix
+#        (softclient4es-arrow#125) rolled into the federation + sidecar images.
+version: 0.3.1
 # The federation application/image version this chart deploys by default.
 # Keep in sync with docker.io/softnetwork/softclient4es-federation:<tag>.
 # NOTE: this appVersion is the future PUBLISHED-release tag (OQ-2) of the public
 # DockerHub federation image — set it to whatever tag the release/CI push (OQ-1)
 # produces; until then it is PROPOSED.
-appVersion: "0.2.0"
+appVersion: "0.2.1"
 keywords:
   - elasticsearch
   - flight-sql
diff --git a/softclient4es-federation/tests/golden/default.yaml b/softclient4es-federation/tests/golden/default.yaml
index b728fae..aba3f63 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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 9eafe6a..6a247fa 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: e8fc04a9ca01bd0f0ff08964beca0bee9a2da40b729f47d4aa0b57a3fb2bac95
+        checksum/config: 88adb746deeb74e6c9c44fcc1e6429088a0c3369e801c3a5b32ef4528de53132
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -227,7 +227,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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 5858d36..2c1018b 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: 1b75346d97567cae377a26f4e7f2e8d5c6920da45e8e7f9ca4e4b986169ece2b
+        checksum/config: 5131b7a28c59a77ccbf623ff0e5950a630557ffeea744b22776493c438ae7642
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -138,7 +138,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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 9eafe6a..6a247fa 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: e8fc04a9ca01bd0f0ff08964beca0bee9a2da40b729f47d4aa0b57a3fb2bac95
+        checksum/config: 88adb746deeb74e6c9c44fcc1e6429088a0c3369e801c3a5b32ef4528de53132
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -227,7 +227,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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 74e509c..8832804 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: 09457749b0df680bf9a554b7867d5434503be84e4aa95d470b279614c251837e
+        checksum/config: c288776cc9fbcd61fb985bc0b4f28e88f2bf0db48163b131aff63d2126433fe7
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -138,7 +138,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -362,10 +362,10 @@ kind: Ingress
 metadata:
   name: fed-softclient4es-federation
   labels:
-    helm.sh/chart: softclient4es-federation-0.3.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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 83b4e3b..8fd7d1c 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: 96ea5304467e9aeffe1259c56d05d5c9093a1d7c3d1611bf4315d75697e47dbe
+        checksum/config: 6715c8a84560b6e70668db538c9998de44d33d1f87b0be453276ad7b37be36fe
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -147,7 +147,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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 f543712..cd5f5ec 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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         app.kubernetes.io/name: softclient4es-federation
         app.kubernetes.io/instance: fed
-        app.kubernetes.io/version: "0.2.0"
+        app.kubernetes.io/version: "0.2.1"
         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: 24fa1a5267bbb746f19103e9801a86915f61bb22678cde9321901bf3ec41c2fb
+        checksum/config: 3b7f3a99d5568628c23b9c4dcc48de3c82d8bcfae91e002bd2dac9eec827f162
     spec:
       serviceAccountName: fed-softclient4es-federation
       securityContext:
@@ -169,7 +169,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: federation
-          image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
+          image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es8-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     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.0"
+    app.kubernetes.io/version: "0.2.1"
     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.0
+        helm.sh/chart: softclient4es-federation-0.3.1
         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.0"
+        app.kubernetes.io/version: "0.2.1"
         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.0"
+          image: "docker.io/softnetwork/softclient4es9-arrow-flight-sql:0.2.1"
           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.0
+    helm.sh/chart: softclient4es-federation-0.3.1
     app.kubernetes.io/name: softclient4es-federation
     app.kubernetes.io/instance: fed
-    app.kubernetes.io/version: "0.2.0"
+    app.kubernetes.io/version: "0.2.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: federation
     app.kubernetes.io/part-of: softclient4es