diff --git a/templates/gocd/0/docker-compose.yml.tpl b/templates/gocd/0/docker-compose.yml.tpl
index bdd6ca9..54b7f54 100644
--- a/templates/gocd/0/docker-compose.yml.tpl
+++ b/templates/gocd/0/docker-compose.yml.tpl
@@ -5,7 +5,7 @@ services:
     tty: true
     image: webcenter/alpine-gocd-server:17.3.0-1
     volumes:
-    {{- if (contains .Values.VOLUME_DRIVER_SERVER "/")}}
+    {{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_SERVER) "/" }}
       - ${VOLUME_DRIVER_SERVER}:/data
     {{- else}}
       - gocd-server-data:/data
@@ -36,7 +36,7 @@ services:
       - GOCD_PLUGIN_google-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/google-oauth-login-2.3.jar
       - GOCD_PLUGIN_github-auth=https://github.com/gocd-contrib/gocd-oauth-login/releases/download/v2.3/github-oauth-login-2.3.jar
       {{- end}}
-    {{- if (ne .Values.DEPLOY_LB "true") and .Values.PUBLISH_PORT}}
+    {{- if and (ne .Values.DEPLOY_LB "true") (.Values.PUBLISH_PORT)}}
     ports:
       - ${PUBLISH_PORT}:8153
     {{- end}}
@@ -46,7 +46,7 @@ services:
     {{- if eq .Values.DEPLOY_LB "true"}}
   lb:
     image: rancher/lb-service-haproxy:v0.6.2
-      {{- if .Values.PUBLISH_PORT}}
+      {{- if (.Values.PUBLISH_PORT)}}
     ports:
       - ${PUBLISH_PORT}:8153/tcp
       {{- else}}
@@ -65,7 +65,7 @@ services:
     tty: true
     image: webcenter/alpine-gocd-agent:17.3.0-1
     volumes:
-    {{- if (contains .Values.VOLUME_DRIVER_AGENT "/")}}
+    {{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
       - ${VOLUME_DRIVER_AGENT}:/data
     {{- else}}
       - gocd-agent-data:/data
@@ -102,7 +102,7 @@ services:
       io.rancher.container.hostname_override: container_name
     image: index.docker.io/docker:1.13-dind
     volumes:
-    {{- if (contains .Values.VOLUME_DRIVER_AGENT "/")}}
+    {{- if eq (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
       - ${VOLUME_DRIVER_AGENT}:/data
     {{- else}}
       - gocd-agent-data:/data
@@ -114,12 +114,12 @@ volumes:
   gocd-scheduler-setting:
     driver: local
     per_container: true
-  {{- if not (contains .Values.VOLUME_DRIVER_AGENT "/")}}
+  {{- if ne (printf "%.1s" .Values.VOLUME_DRIVER_AGENT) "/"}}
   gocd-agent-data:
     driver: ${VOLUME_DRIVER_AGENT}
     per_container: true
   {{- end}}
-  {{- if not (contains .Values.VOLUME_DRIVER_SERVER "/")}}
+  {{- if ne (printf "%.1s" .Values.VOLUME_DRIVER_SERVER) "/"}}
   gocd-server-data:
     driver: ${VOLUME_DRIVER_SERVER}
   {{- end}}