diff --git a/templates/gocd/0/docker-compose.yml b/templates/gocd/0/docker-compose.yml
index fc2f270..61abe2a 100644
--- a/templates/gocd/0/docker-compose.yml
+++ b/templates/gocd/0/docker-compose.yml
@@ -13,6 +13,7 @@ services:
     environment:
       - GOCD_CONFIG_memory=${GOCD_SERVER_MEMORY}
       - GOCD_CONFIG_agent-key=${GOCD_AGENT_KEY}
+      - GOCD_USER_${GOCD_USER}=${GOCD_PASSWORD}
       {{- if eq .Values.GOCD_AGENT_PACKAGE "true"}}
       - GOCD_PLUGIN_script-executor=https://github.com/gocd-contrib/script-executor-task/releases/download/0.3/script-executor-0.3.0.jar
       - GOCD_PLUGIN_docker-task=https://github.com/manojlds/gocd-docker/releases/download/0.1.27/docker-task-assembly-0.1.27.jar
diff --git a/templates/gocd/0/rancher-compose.yml b/templates/gocd/0/rancher-compose.yml
index bb75a2a..6df6dfe 100644
--- a/templates/gocd/0/rancher-compose.yml
+++ b/templates/gocd/0/rancher-compose.yml
@@ -51,6 +51,17 @@ catalog:
       type: "string"
       required: true
       default: "docker"
+    - variable: "GOCD_USER"
+      description: "Login to connect on GoCD"
+      label: "Login"
+      type: "string"
+      required: true
+      default: "admin"
+    - variable: "GOCD_PASSWORD"
+      description: "Password to connect on GoCD"
+      label: "Password"
+      type: "password"
+      required: true
     - variable: "GOCD_AGENT_PACKAGE"
       description: "Install GoCD extra plugins"
       label: "Install extra plugins"