diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97f907dd1e09850ef2e880b2dd76e62f4522aec6..784ce953a3d453d271830bab75b0e41f330303fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,7 +95,7 @@ ska-tango-examples-tests:
       for i in {1..800}
       do
         response=$(curl -s --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$pipeline_url")
-        status=$(jq -r '.status' <<< "$response")
+        status=$(jq -r '.status' <<< "$response" || true) 
         if [[ $status == "running" ]]; then
           response=$(curl -s --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$jobs_url")
           k8steststatus=$(jq -r '.[] | select(.name == "k8s-test") | .status' <<< $response)
diff --git a/.make b/.make
index 3db25005b85fc0413cdb1eb3678997f816429f23..f3c36666eb1b1b7fa4b01bc4047b9209ed47126b 160000
--- a/.make
+++ b/.make
@@ -1 +1 @@
-Subproject commit 3db25005b85fc0413cdb1eb3678997f816429f23
+Subproject commit f3c36666eb1b1b7fa4b01bc4047b9209ed47126b
diff --git a/docs/src/helm_charts.rst b/docs/src/helm_charts.rst
index 7f689fc0d98dcc4020e6525fa95714a576c8faed..9c49cd3c9defb9f0d026467d711d40736bd9e7a4 100644
--- a/docs/src/helm_charts.rst
+++ b/docs/src/helm_charts.rst
@@ -167,8 +167,8 @@ This templates are called by the below `template <https://gitlab.com/ska-telesco
     {{ template "ska-tango-util.multidevice-sacc-role.tpl" $context }}
     {{ template "ska-tango-util.multidevice-job.tpl" $context }}
     {{ template "ska-tango-util.multidevice-svc.tpl" $context }}
-    {{ template "ska-tango-util.deviceserver-pvc.tpl" $context }}
-
+    {{- $volume_context := dict "volume" $filedeviceserver.volume "local" $localchart }}
+    {{ template "ska-tango-util.deviceserver-pvc.tpl" $volume_context }}
 
     {{- else }}
 
@@ -178,17 +178,21 @@ This templates are called by the below `template <https://gitlab.com/ska-telesco
     {{ template "ska-tango-util.multidevice-sacc-role.tpl" $context }}
     {{ template "ska-tango-util.multidevice-job.tpl" $context }}
     {{ template "ska-tango-util.multidevice-svc.tpl" $context }}
-    {{ template "ska-tango-util.deviceserver-pvc.tpl" $context }}
+    {{- $volume_context := dict "volume" $deviceserver.volume "local" $localchart }}
+    {{ template "ska-tango-util.deviceserver-pvc.tpl" $volume_context }}
+
 
     {{- end }}
 
     {{- end }} # deviceservers
 
 Tango-example template description:
-    - **Line 3**  to **Line 26** : This template will iterate through each field under deviceServers on the values.yaml file.
+    - **Line 3**  to **Line 29** : This template will iterate through each field under deviceServers on the values.yaml file.
     - **Line 5**  to **Line 15** : If the device server has a file field we will get that configuration file and use it. (**Best Practice**: Add the deviceServer configuration in the data folder and then pass the path of it in the file field of the deviceServer).
-    - **Line 15** to **Line 25** : If there is no file field it means that the configuration of this device was done inside the value.yaml. (**Note:** Making the configuration of the device inside the values.yaml makes this file bigger becoming harder to read and understand)
-    - **Line 8**  : As discussed before it is possible to have a instances field in the values.yaml file and in the data file, it is also possible to have instances defined as a global field. It is being used a coalesced function that takes the first not null value of the list. The priority is, first it takes the instance value from the global variable if there is none it takes it from the values file and then from the data file.
-    - **Line 27** : Same as line 8 but without the possibility of having the instance field on the data file.
-    - **Line 9** and **Line 18** : Context is a list of variables that will passed as arguments to the templates.
+    - **Line 17** to **Line 26** : If there is no file field it means that the configuration of this device was done inside the value.yaml. (**Note:** Making the configuration of the device inside the values.yaml makes this file bigger becoming harder to read and understand)
+    - **Line 7**  : As discussed before it is possible to have a instances field in the values.yaml file and in the data file, it is also possible to have instances defined as a global field. It is being used a coalesced function that takes the first not null value of the list. The priority is, first it takes the instance value from the global variable if there is none it takes it from the values file and then from the data file.
+    - **Line 19** : Same as line 8 but without the possibility of having the instance field on the data file.
+    - **Line 9** and **Line 20** : Context is a list of variables that will passed as arguments to the templates.
+    - **Line 14** to **Line 15**: Use and set the context for persistent volume claims attached to teh deviceserver
+    - **Line 25** to **Line 26**: same as 14 to 15
     - **Templates** : There are five templates already described before. Each template will be called for each deviceServer as they are inside the range loop (line 3).