diff --git a/charts/archiver/Chart.yaml b/charts/archiver/Chart.yaml
index b119c22773aeef77ab1283d8ea0ee7b4667fb6dc..f412400166066b3dfb48f83bf4a07df5210672ec 100644
--- a/charts/archiver/Chart.yaml
+++ b/charts/archiver/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes
 name: archiver
-version: 0.2.7
+version: 0.2.8
 appVersion: 1.16.0
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.4
+  version: 0.2.5
   repository: file://../tango-util
 # The archiver cannot have the tango-base since we allow only one level in the chart hierarchies
 # - name: tango-base
diff --git a/charts/ska-docker/Chart.yaml b/charts/ska-docker/Chart.yaml
index 7c35a0c96ecb4fc509dd89832ad4daf6f8b2b355..338fb5e58abfb0cd0d605176681cc162d9923984 100644
--- a/charts/ska-docker/Chart.yaml
+++ b/charts/ska-docker/Chart.yaml
@@ -6,7 +6,7 @@ version: 0.1.7
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-base
-  version: 0.2.7
+  version: 0.2.8
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml
index e2b033e130fe4a77526a6e24d9ab42e37b09cba0..415c344c4c90e7144f246a066d1623860f4e47fa 100644
--- a/charts/tango-base/Chart.yaml
+++ b/charts/tango-base/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: tango-base
-version: 0.2.7
+version: 0.2.8
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.4
+  version: 0.2.5
   repository: file://../tango-util
\ No newline at end of file
diff --git a/charts/tango-util/Chart.yaml b/charts/tango-util/Chart.yaml
index d3a68dfaf707b2dd55e18068981674fcb55cf897..6c2fed2fd1aa8d6cdc22e435e7d5181243408957 100644
--- a/charts/tango-util/Chart.yaml
+++ b/charts/tango-util/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 description: A Helm chart library of utilities for TANGO deployents
 name: tango-util
 type: library
-appVersion: 0.2.4
-version: 0.2.4
+appVersion: 0.2.5
+version: 0.2.5
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo
diff --git a/charts/tango-util/templates/_configuration.yaml b/charts/tango-util/templates/_configuration.yaml
index a8968fe4b21a0228837adf17582d97c46605b710..e8938ecce53158307740994ce6f2327b6ee33965 100644
--- a/charts/tango-util/templates/_configuration.yaml
+++ b/charts/tango-util/templates/_configuration.yaml
@@ -63,6 +63,9 @@ spec:
         image: {{ $dsconfig.image.registry }}/{{ $dsconfig.image.image }}:{{ $dsconfig.image.tag }}
         imagePullPolicy: {{ $dsconfig.image.pullPolicy }}
         command:
+          - retry
+          - --max=10
+          - --
           - /usr/local/bin/wait-for-it.sh
           - {{ $tango_host }}
           - --timeout=60
diff --git a/charts/tango-util/templates/_deviceserver.yaml b/charts/tango-util/templates/_deviceserver.yaml
index 3fc640bdbe8f4305ba136275f8caa4bc31692377..c7ab41032172671ab0770aeb47d1c9eb27479bfb 100644
--- a/charts/tango-util/templates/_deviceserver.yaml
+++ b/charts/tango-util/templates/_deviceserver.yaml
@@ -69,6 +69,9 @@ spec:
         image: "{{ $dsconfig.image.registry }}/{{ $dsconfig.image.image }}:{{ $dsconfig.image.tag }}"
         imagePullPolicy: {{ $dsconfig.image.pullPolicy }}
         command:
+          - retry
+          - --max=10
+          - --
           - /usr/local/bin/wait-for-it.sh
           - {{ $device.host }}
           - --timeout=60