diff --git a/templates/gocd-agent/0/README.md b/templates/gocd-agent/0/README.md
new file mode 100644
index 0000000..a33c388
--- /dev/null
+++ b/templates/gocd-agent/0/README.md
@@ -0,0 +1,17 @@
+# Gocd agent (Experimental)
+
+### Info:
+
+ This template creates and configure a gocd server agent.
+ 
+ 
+### Usage:
+
+ Select gocd-agent from catalog. 
+ 
+ Enter the mem parameters, gocd-server stack/service and port.
+ 
+ Click deploy.
+ 
+ gocd-agent can now be accessed over the Rancher network. 
+ 
diff --git a/templates/gocd-agent/0/docker-compose.yml b/templates/gocd-agent/0/docker-compose.yml
new file mode 100644
index 0000000..d56c3ec
--- /dev/null
+++ b/templates/gocd-agent/0/docker-compose.yml
@@ -0,0 +1,16 @@
+gocd-agent:
+  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
+    gocd.role: agent
+  tty: true
+  image: rawmind/rancher-goagent:16.2.1-1
+  external_links:
+  - ${goserver_ip}:gocd-server.rancher.internal
+  environment:
+  - AGENT_MEM=${mem_initial}m
+  - AGENT_MAX_MEM=${mem_max}m
+  - GO_SERVER=gocd-server.rancher.internal
+  - GO_SERVER_PORT=${goserver_port}
+  volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
diff --git a/templates/gocd-agent/0/rancher-compose.yml b/templates/gocd-agent/0/rancher-compose.yml
new file mode 100644
index 0000000..661544b
--- /dev/null
+++ b/templates/gocd-agent/0/rancher-compose.yml
@@ -0,0 +1,43 @@
+.catalog:
+  name: gocd-agent
+  version: 16.2.1-rancher1
+  description: |
+    (Experimental) Gocd agent.
+  maintainer: "Raul Sanchez <rawmind@gmail.com>"
+  minimum_rancher_version: v0.59.0
+  uuid: goagent-0
+  questions:
+    - variable: "mem_initial"
+      description: "Initial java memory in Mb"
+      label: "Initial memory:"
+      required: true
+      default: 512
+      type: "int"
+    - variable: "mem_max"
+      description: "Max java memory in Mb"
+      label: "Max memory:"
+      required: true
+      default: 1024
+      type: "int"
+    - variable: "goserver_ip"
+      description: |
+        Choose the gocd service to connect. 
+      label: "Gocd server stack/service"
+      default: "gocd-sever/gocd-server"
+      required: true
+      type: "service"
+    - variable: "goserver_port"
+      description: "Gocd server port"
+      label: "Goserver port:"
+      required: true
+      default: 8153
+      type: "int"
+    - variable: "scale"
+      description: "Gocd agent instances"
+      label: "Instances:"
+      required: true
+      default: 1
+      type: "int"
+gocd-agent:
+  scale: ${scale}
+  retain_ip: true
diff --git a/templates/gocd-agent/catalogIcon-gocd-agent.png b/templates/gocd-agent/catalogIcon-gocd-agent.png
new file mode 100644
index 0000000..8983baa
Binary files /dev/null and b/templates/gocd-agent/catalogIcon-gocd-agent.png differ
diff --git a/templates/gocd-agent/config.yml b/templates/gocd-agent/config.yml
new file mode 100644
index 0000000..44fa3c7
--- /dev/null
+++ b/templates/gocd-agent/config.yml
@@ -0,0 +1,8 @@
+name: gocd-agent
+description: |
+  (Experimental) Gocd agent
+version: 16.2.1-rancher1
+category: "Continuous Integration"
+maintainer: "Raul Sanchez <rawmind@gmail.com>"
+minimum_rancher_version: v0.59.0
+license: 
diff --git a/templates/gocd-server/0/README.md b/templates/gocd-server/0/README.md
new file mode 100644
index 0000000..de78b07
--- /dev/null
+++ b/templates/gocd-server/0/README.md
@@ -0,0 +1,18 @@
+# Gocd server (Experimental)
+
+### Info:
+
+ This template creates and configure a gocd server instance.
+
+ You can add a local or a convoy-gluster volume to retain gocd-server data. 
+ 
+### Usage:
+
+ Select gocd-server from catalog. 
+ 
+ Enter the mem parameters, volume and volume driver.
+ 
+ Click deploy.
+ 
+ gocd-server can now be accessed over the Rancher network. 
+ 
diff --git a/templates/gocd-server/0/docker-compose.yml b/templates/gocd-server/0/docker-compose.yml
new file mode 100644
index 0000000..491f731
--- /dev/null
+++ b/templates/gocd-server/0/docker-compose.yml
@@ -0,0 +1,23 @@
+gocd-server:
+  labels:
+    gocd.role: server
+  tty: true
+  image: rawmind/rancher-goserver:16.2.1-3
+  volumes_from:
+  - gocd-volume
+  environment:
+  - SERVER_MEM=${mem_initial}m
+  - SERVER_MAX_MEM=${mem_max}m
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: gocd-volume
+gocd-volume:
+  net: none
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.container.start_once: true
+  volumes:
+  - ${volume_work}:/opt/go-server/work
+  volume_driver: ${volume_driver}
+  entrypoint: /bin/true
+  image: busybox
diff --git a/templates/gocd-server/0/rancher-compose.yml b/templates/gocd-server/0/rancher-compose.yml
new file mode 100644
index 0000000..c8ad43f
--- /dev/null
+++ b/templates/gocd-server/0/rancher-compose.yml
@@ -0,0 +1,47 @@
+.catalog:
+  name: gocd-server
+  version: 16.2.1-rancher1
+  description: |
+    (Experimental) Gocd server.
+  maintainer: "Raul Sanchez <rawmind@gmail.com>"
+  minimum_rancher_version: v0.59.0
+  uuid: goserver-0
+  questions:
+    - variable: "mem_initial"
+      description: "Initial java memory in Mb"
+      label: "Initial memory:"
+      required: true
+      default: 512
+      type: "int"
+    - variable: "mem_max"
+      description: "Max java memory in Mb"
+      label: "Max memory:"
+      required: true
+      default: 1024
+      type: "int"
+    - variable: "volume_work"
+      description: "Work volume to save goserver data"
+      label: "Work volume:"
+      required: true
+      default: "/var/lib/docker/go-server-work"
+      type: "string"
+    - variable: "volume_driver" 
+      label: "Driver volume:"
+      description: |
+        Choose the volume driver to use.
+      default: local
+      required: true
+      type: enum
+      options:
+        - local
+        - convoy-gluster
+gocd-server:
+  scale: 1
+  retain_ip: true
+  health_check:
+    port: 8153
+    interval: 5000
+    unhealthy_threshold: 5
+    request_line: GET /go/agents HTTP/1.0
+    healthy_threshold: 2
+    response_timeout: 5000
diff --git a/templates/gocd-server/catalogIcon-gocd-server.png b/templates/gocd-server/catalogIcon-gocd-server.png
new file mode 100644
index 0000000..8983baa
Binary files /dev/null and b/templates/gocd-server/catalogIcon-gocd-server.png differ
diff --git a/templates/gocd-server/config.yml b/templates/gocd-server/config.yml
new file mode 100644
index 0000000..ebc6ca8
--- /dev/null
+++ b/templates/gocd-server/config.yml
@@ -0,0 +1,8 @@
+name: gocd-server
+description: |
+  (Experimental) Gocd server
+version: 16.2.1-rancher1
+category: "Continuous Integration"
+maintainer: "Raul Sanchez <rawmind@gmail.com>"
+minimum_rancher_version: v0.59.0
+license: