diff --git a/templates/drone/0/README.md b/templates/drone/0/README.md
new file mode 100644
index 0000000..1abe14f
--- /dev/null
+++ b/templates/drone/0/README.md
@@ -0,0 +1,17 @@
+# Drone
+
+### Info:
+
+This template creates an instance of Drone CI server 0.4.
+
+### Usage:
+
+Select the Drone template from the catalog. Provide the following information:
+
+1. Database driver
+2. Database configuration: this will look like either a path `/var/lib/drone/sqlite3` or a connection string `<user>:<password>@tcp(database:<port>)<database>?parseTime=true`
+The name will always be database.
+3. Remote repository store. (Ie. GitHub)
+4. Remote repository store configuration.
+
+See [Drone documentation](http://readme.drone.io/setup/overview/) for complete information.
diff --git a/templates/drone/0/docker-compose.yml b/templates/drone/0/docker-compose.yml
new file mode 100644
index 0000000..68bbecf
--- /dev/null
+++ b/templates/drone/0/docker-compose.yml
@@ -0,0 +1,44 @@
+drone-lb:
+  ports:
+  - ${public_port}:8000
+  tty: true
+  image: rancher/load-balancer-service
+  links:
+  - drone-server:drone-server
+  stdin_open: true
+
+drone-healthcheck:
+  image: rancher/drone-config:v0.1.0
+  volumes_from:
+    - drone-data-volume
+  entrypoint: /giddyup health
+
+drone-server:
+  image: rancher/drone-config:v0.1.0
+  volumes_from:
+    - drone-data-volume
+  labels: 
+    io.rancher.sidekicks: drone-data-volume,drone-daemon,drone-healthcheck
+  external_links:
+    - ${database_service}:database
+
+drone-daemon:
+  image: rancher/drone:0.4
+  net: 'container:drone-server'
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+  volumes_from:
+    - drone-data-volume
+  entrypoint: /opt/rancher/rancher_entry.sh
+
+## Do not change below. Could cause data loss in upgrade.
+drone-data-volume:
+  image: busybox
+  net: none
+  command: /bin/true
+  labels:
+    io.rancher.container.start_once: 'true'
+  volumes:
+    - /var/lib/drone
+    - /etc/drone
+    - /opt/rancher
diff --git a/templates/drone/0/rancher-compose.yml b/templates/drone/0/rancher-compose.yml
new file mode 100644
index 0000000..bec1fde
--- /dev/null
+++ b/templates/drone/0/rancher-compose.yml
@@ -0,0 +1,65 @@
+.catalog:
+  name: Drone
+  version: 0.4-rancher1
+  description: |
+    Drone CI Server
+  questions:
+    - variable: "remote_driver"
+      type: "enum"
+      required: true
+      label: "Remote Driver"
+      description: "Remote Git and Auth scheme"
+      options:
+        - github
+        - bitbucket
+        - gitlab
+        - gogs
+    - variable: "remote_config"
+      type: "password"
+      required: true
+      label: "Remote Config"
+      description: "Must be the full connection string. see http://readme.drone.io/setup/overview/ for more info"
+    - variable: "public_port"
+      type: "int"
+      required: true
+      label: "Public Port"
+      description: "Port that the load balancer will listen on. Must be accessible to remote driver for webhooks"
+    - variable: "database_driver"
+      type: "enum"
+      label: "Database Driver"
+      description: "Database backend to use."
+      required: true
+      default: "sqlite3"
+      options:
+        - sqlite3
+        - postgres
+        - mysql
+    - variable: "database_config"
+      label: "Database Config"
+      type: "password"
+      required: true
+      description: "Must be full db string. The hostname for the DB will be 'database'. See http://readme.drone.io/setup/overview/ for more info"
+    - variable: "database_service"
+      type: "service"
+      label: "Database Service"
+      description: "Service to link to for database. For instance if using the default Rancher Galera cluster select galera/galera-lb."
+      default: "drone-server"
+drone-lb:
+  scale: 1
+  load_balancer_config:
+    haproxy_config: {}
+  health_check:
+    port: 42
+    interval: 2000
+    unhealthy_threshold: 3
+    healthy_threshold: 2
+    response_timeout: 2000
+drone-server:
+  scale: 1
+  metadata:
+    remote_driver: ${remote_driver}
+    remote_config: "${remote_config}"
+    database_driver: ${database_driver}
+    database_config: "${database_config}"
+    http_proxy_on: "false"
+    debug: "true"
diff --git a/templates/drone/1/README.md b/templates/drone/1/README.md
new file mode 100644
index 0000000..1abe14f
--- /dev/null
+++ b/templates/drone/1/README.md
@@ -0,0 +1,17 @@
+# Drone
+
+### Info:
+
+This template creates an instance of Drone CI server 0.4.
+
+### Usage:
+
+Select the Drone template from the catalog. Provide the following information:
+
+1. Database driver
+2. Database configuration: this will look like either a path `/var/lib/drone/sqlite3` or a connection string `<user>:<password>@tcp(database:<port>)<database>?parseTime=true`
+The name will always be database.
+3. Remote repository store. (Ie. GitHub)
+4. Remote repository store configuration.
+
+See [Drone documentation](http://readme.drone.io/setup/overview/) for complete information.
diff --git a/templates/drone/1/docker-compose.yml b/templates/drone/1/docker-compose.yml
new file mode 100644
index 0000000..b659217
--- /dev/null
+++ b/templates/drone/1/docker-compose.yml
@@ -0,0 +1,45 @@
+drone-lb:
+  ports:
+  - ${public_port}:8000
+  tty: true
+  image: rancher/load-balancer-service
+  links:
+  - drone-server:drone-server
+  stdin_open: true
+
+drone-healthcheck:
+  image: rancher/drone-config:v0.1.0
+  net: 'container:drone-server'
+  volumes_from:
+    - drone-data-volume
+  entrypoint: /giddyup health
+
+drone-server:
+  image: rancher/drone-config:v0.1.0
+  volumes_from:
+    - drone-data-volume
+  labels: 
+    io.rancher.sidekicks: drone-data-volume,drone-daemon,drone-healthcheck
+  external_links:
+    - ${database_service}:database
+
+drone-daemon:
+  image: rancher/drone:0.4
+  net: 'container:drone-server'
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+  volumes_from:
+    - drone-data-volume
+  entrypoint: /opt/rancher/rancher_entry.sh
+
+## Do not change below. Could cause data loss in upgrade.
+drone-data-volume:
+  image: busybox
+  net: none
+  command: /bin/true
+  labels:
+    io.rancher.container.start_once: 'true'
+  volumes:
+    - /var/lib/drone
+    - /etc/drone
+    - /opt/rancher
diff --git a/templates/drone/1/rancher-compose.yml b/templates/drone/1/rancher-compose.yml
new file mode 100644
index 0000000..6c6c692
--- /dev/null
+++ b/templates/drone/1/rancher-compose.yml
@@ -0,0 +1,73 @@
+.catalog:
+  name: Drone
+  version: 0.4-rancher2
+  description: |
+    Drone CI Server
+  questions:
+    - variable: "remote_driver"
+      type: "enum"
+      required: true
+      label: "Remote Driver"
+      description: "Remote Git and Auth scheme"
+      options:
+        - github
+        - bitbucket
+        - gitlab
+        - gogs
+    - variable: "remote_config"
+      type: "password"
+      required: true
+      label: "Remote Config"
+      description: "Must be the full connection string. see http://readme.drone.io/setup/overview/ for more info"
+    - variable: "public_port"
+      type: "int"
+      required: true
+      label: "Public Port"
+      description: "Port that the load balancer will listen on. Must be accessible to remote driver for webhooks"
+    - variable: "database_driver"
+      type: "enum"
+      label: "Database Driver"
+      description: "Database backend to use."
+      required: true
+      default: "sqlite3"
+      options:
+        - sqlite3
+        - postgres
+        - mysql
+    - variable: "database_config"
+      label: "Database Config"
+      type: "password"
+      required: true
+      description: "Must be full db string. The hostname for the DB will be 'database'. See http://readme.drone.io/setup/overview/ for more info"
+    - variable: "database_service"
+      type: "service"
+      label: "Database Service"
+      description: "Service to link to for database. For instance if using the default Rancher Galera cluster select galera/galera-lb."
+      default: "drone-server"
+drone-lb:
+  scale: 1
+  load_balancer_config:
+    haproxy_config: {}
+  health_check:
+    port: 42
+    interval: 2000
+    unhealthy_threshold: 3
+    healthy_threshold: 2
+    response_timeout: 2000
+drone-server:
+  scale: 1
+  metadata:
+    remote_driver: ${remote_driver}
+    remote_config: "${remote_config}"
+    database_driver: ${database_driver}
+    database_config: "${database_config}"
+    http_proxy_on: "false"
+    debug: "true"
+  health_check:
+    port: 1620
+    interval: 2000
+    unhealthy_threshold: 3
+    strategy: recreate
+    request_line: GET /ping HTTP/1.0
+    healthy_threshold: 2
+    response_timeout: 2000
diff --git a/templates/drone/catalogIcon-droneio.svg b/templates/drone/catalogIcon-droneio.svg
new file mode 100644
index 0000000..be92f11
--- /dev/null
+++ b/templates/drone/catalogIcon-droneio.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="43"
+   height="36.350704"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="drone-logo-no-circle.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#2b303b"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="26.576205"
+     inkscape:cy="-72.54425"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-global="false"
+     inkscape:window-width="1295"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-21.720779px"
+       originy="-990.37188px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-21.720779,-25.639593)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#2b303b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2998"
+       sodipodi:cx="172.10474"
+       sodipodi:cy="458.39249"
+       sodipodi:rx="5.4295697"
+       sodipodi:ry="5.0507627"
+       d="m 177.53431,458.39249 c 0,2.78946 -2.43091,5.05076 -5.42957,5.05076 -2.99867,0 -5.42957,-2.2613 -5.42957,-5.05076 0,-2.78946 2.4309,-5.05077 5.42957,-5.05077 2.99866,0 5.42957,2.26131 5.42957,5.05077 z"
+       transform="matrix(1.0129716,0,0,1.0889445,-131.11643,-452.42373)" />
+    <path
+       style="fill:#2b303b;fill-opacity:1;stroke-width:0;stroke-miterlimit:4"
+       d="m 43.220779,25.640247 c 9.60163,0.0752 20.51786,6.8438 21.5,19.6 l -13,0 c 0,0 -1.67472,-7.04733 -8.5,-7 -6.82528,0.0473 -8.5,7 -8.5,7 l -13,0 c 0.63161,-12.53073 11.36576,-19.67935 21.5,-19.6 z"
+       id="rect3810"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scczccs" />
+    <path
+       style="fill:#2b303b;fill-opacity:1;stroke-width:0;stroke-miterlimit:4"
+       d="m 43.310069,61.990247 c -7.159395,0.01905 -13.847588,-5.383347 -16.58929,-13.75 l 8,0 c 0,0 1.72575,6.96782 8.55103,6.92049 6.82528,-0.0473 8.44897,-6.92049 8.44897,-6.92049 l 8,0 c -1.783351,8.850973 -9.251314,13.730946 -16.41071,13.75 z"
+       id="rect3810-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scczccs" />
+  </g>
+</svg>
diff --git a/templates/drone/config.yml b/templates/drone/config.yml
new file mode 100644
index 0000000..358b631
--- /dev/null
+++ b/templates/drone/config.yml
@@ -0,0 +1,5 @@
+name: Drone
+description: |
+    Drone CI Server
+version: 0.4-rancher2
+category: Continuous Integration