diff --git a/templates/gocd/0/docker-compose.yml b/templates/gocd/0/docker-compose.yml
index 7fe1f36..f7f6d3f 100644
--- a/templates/gocd/0/docker-compose.yml
+++ b/templates/gocd/0/docker-compose.yml
@@ -63,9 +63,9 @@ services:
     image: webcenter/alpine-gocd-agent:develop
     volumes:
     {{- if (contains .Values.VOLUME_DRIVER_AGENT "/")}}
-      - gocd-agent-data:/data
-    {{- else}}
       - ${VOLUME_DRIVER_AGENT}:/data
+    {{- else}}
+      - gocd-agent-data:/data
     {{- end}}
       - gocd-scheduler-setting:/opt/scheduler
     environment:
@@ -108,7 +108,7 @@ services:
   
 
 volumes:
-  minio-scheduler-setting:
+  gocd-scheduler-setting:
     driver: local
     per_container: true
   {{- if not (contains .Values.VOLUME_DRIVER_AGENT "/")}}