diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd0dc799706437d268aaaf5803c8aa7b6d234a2b..97f907dd1e09850ef2e880b2dd76e62f4522aec6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,9 @@ before_script:
 
 ska-tango-examples-tests:
   stage: test
+  tags:
+    - k8srunner
+  retry: 2
   script:
     - |
       VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-builder)
@@ -75,7 +78,7 @@ ska-tango-examples-tests:
       VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-runtime)
       export BASE_IMAGE="${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:${VERS}"
       export OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
-      export PYTANGO_VERSION="9.3.6"
+      export PYTANGO_VERSION="$(docker run ${BUILD_IMAGE} pip list | grep pytango | awk '{print $2}')"
       response=$(curl --request POST \
            --form token=$CI_JOB_TOKEN \
            --form ref=master \
diff --git a/.release b/.release
index 6ebfd1a7a96fab011e4979a3545956692f4a1f65..c00ac63de4835b47c1329bf26a188f989fa0dd11 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.24
-tag=0.3.24
+release=0.3.25
+tag=0.3.25
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index e32b7262cdb6881bd57415056136748beba64ef0..29df8ca0dbcb43978fc9321703069ae60d26adee 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: 0.3.23
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-tango-base
-version: 0.3.24
+version: 0.3.25
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-util
-  version: 0.3.22
+  version: 0.3.23
   repository: file://../ska-tango-util
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index 90db9f22c37b0c17ae17ea4d0949edb993ca1ae5..945d2502e2a7953199c63716b7dd23b0de488eed 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
 appVersion: 0.2.5
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-tango-umbrella
-version: 0.2.5
+version: 0.2.6
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-base
-  version: 0.3.24
+  version: 0.3.25
   repository: file://../ska-tango-base
   condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
 - name: ska-tango-util
-  version: 0.3.22
+  version: 0.3.23
   repository: file://../ska-tango-util
 
diff --git a/charts/ska-tango-util/Chart.yaml b/charts/ska-tango-util/Chart.yaml
index 62c74a14ea69bb48b81de31e9a1dba25b4d9610a..8a64a070d1ad25689613b880c3e874bb918d7a7c 100644
--- a/charts/ska-tango-util/Chart.yaml
+++ b/charts/ska-tango-util/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 description: A Helm chart library of utilities for TANGO deployents
 name: ska-tango-util
 type: library
-appVersion: 0.3.22
-version: 0.3.22
+appVersion: 0.3.23
+version: 0.3.23
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo
diff --git a/charts/ska-tango-util/templates/_multidevice-svc.yaml b/charts/ska-tango-util/templates/_multidevice-svc.yaml
index 62552de83fb4282af1c153051a79324fd205cfc8..a1c1c708aefba4a29bff26048f1a56467ff063c3 100644
--- a/charts/ska-tango-util/templates/_multidevice-svc.yaml
+++ b/charts/ska-tango-util/templates/_multidevice-svc.yaml
@@ -312,13 +312,13 @@ spec:
 {{- if $chart.Values.global.environment_variables }}
 {{- range $index, $envvar := $chart.Values.global.environment_variables }}
         - name: {{$envvar.name}}
-          value: {{tpl ($envvar.value | toString) $chart }}
+          value: {{tpl ($envvar.value | toString) $chart | quote }}
 {{- end }}
 {{- end }}
 {{- if $deviceserver.environment_variables }}
 {{- range $index, $envvar := $deviceserver.environment_variables }}
         - name: {{$envvar.name}}
-          value: {{tpl ($envvar.value | toString) $chart }}
+          value: {{tpl ($envvar.value | toString) $chart | quote }}
 {{- end }}
 {{- end }}
 {{- if not $chart.Values.do_not_constraint_resources }}