diff --git a/templates/gocd/0/docker-compose.yml.tpl b/templates/gocd/0/docker-compose.yml.tpl
index aa37a7a..bcd4107 100644
--- a/templates/gocd/0/docker-compose.yml.tpl
+++ b/templates/gocd/0/docker-compose.yml.tpl
@@ -5,8 +5,8 @@ services:
     tty: true
     image: webcenter/alpine-gocd-server:17.3.0-1
     volumes:
-    {{- if call strings.HasPrefix .Values.VOLUME_DRIVER_SERVER "/" }}
-      - /data/gocd-test:/data
+    {{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_SERVER) "/" }}
+      - ${VOLUME_DRIVER_SERVER}:/data
     {{- else}}
       - gocd-server-data:/data
     {{- end}}