diff --git a/templates/gocd/0/docker-compose.yml b/templates/gocd/0/docker-compose.yml
index a366a6a..436353a 100644
--- a/templates/gocd/0/docker-compose.yml
+++ b/templates/gocd/0/docker-compose.yml
@@ -62,8 +62,8 @@ services:
     environment:
       - GOCD_CONFIG_memory="${GOCD_AGENT_MEMORY}"
       - GOCD_CONFIG_agent_key="${GOCD_AGENT_KEY}"
-      - GOCD_CONFIG_agent_resource_docker= "${GOCD_AGENT_RESOURCE}"
-      - DOCKER_HOST: tcp://docker-engine:2375
+      - GOCD_CONFIG_agent_resource_docker="${GOCD_AGENT_RESOURCE}"
+      - DOCKER_HOST="tcp://docker-engine:2375"
     labels:
       io.rancher.scheduler.affinity:container_label_soft_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
       io.rancher.container.hostname_override: container_name
diff --git a/templates/gocd/0/rancher-compose.yml b/templates/gocd/0/rancher-compose.yml
index 31da10d..bb75a2a 100644
--- a/templates/gocd/0/rancher-compose.yml
+++ b/templates/gocd/0/rancher-compose.yml
@@ -2,6 +2,7 @@ version: '2'
 catalog:
   name: GoCD
   version: 17.3.0-rancher1
+  minimum_rancher_version: v1.5.0
   questions:
     - variable: "DEPLOY_SERVER"
       description: "Deploy GoCD server"
diff --git a/templates/gocd/config.yml b/templates/gocd/config.yml
index f295f44..8c59e5e 100644
--- a/templates/gocd/config.yml
+++ b/templates/gocd/config.yml
@@ -4,6 +4,5 @@ description: |
 version: 17.3.0-rancher1
 category: Continuous Integration
 maintainer: "Sebastien Langoureaux <linuxworkgroup@gmail.com>"
-minimum_rancher_version: v1.5.0
 license: Apache License
 projectURL: https://www.gocd.io/