diff --git a/templates/rethinkdb/0/README.md b/templates/rethinkdb/0/README.md
new file mode 100644
index 0000000..ddc7f05
--- /dev/null
+++ b/templates/rethinkdb/0/README.md
@@ -0,0 +1,17 @@
+# RethinkDB Cluster
+RethinkDB is the first open-source, scalable JSON database built from the ground up for the realtime web. It inverts the traditional database architecture by exposing an exciting new access model – instead of polling for changes, the developer can tell RethinkDB to continuously push updated query results to applications in realtime. RethinkDB’s realtime push architecture dramatically reduces the time and effort necessary to build scalable realtime apps.
+
+
+**This Template creates 2 services:**
+- **rethinkdb:** This is the scalable database service.
+- **rethinkdb-proxy:** This is the proxy service, the query-router and admin panel. (queries are sent to this service)
+
+
+### Repository
+https://github.com/xkodiak/rancher-rethinkdb
+
+### Variables
+- **Proxy Web Port:** admin panel port (default: 8080)
+- **Proxy Query Port:** query port (default: 28015)
+- **Volume Driver:** local, rancher-nfs, ... (default: local)
+
diff --git a/templates/rethinkdb/0/docker-compose.yml b/templates/rethinkdb/0/docker-compose.yml
new file mode 100644
index 0000000..6b69a23
--- /dev/null
+++ b/templates/rethinkdb/0/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '2'
+volumes:
+  rethinkdb-data:
+    driver: '${rethinkdb_volume_driver}'
+    per_container: true
+services:
+  rethinkdb:
+    image: xkodiak/rancher-rethinkdb:2.3.5
+    volumes:
+      - rethinkdb-data:/data
+    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
+  rethinkdb-proxy:
+    image: xkodiak/rancher-rethinkdb:2.3.5
+    entrypoint: /proxy.sh
+    links:
+      - rethinkdb:db
+    ports:
+      - ${rethinkdb_proxy_webport}:8080/tcp
+      - ${rethinkdb_proxy_queryport}:28015/tcp
+    depends_on:
+      - rethinkdb
diff --git a/templates/rethinkdb/0/rancher-compose.yml b/templates/rethinkdb/0/rancher-compose.yml
new file mode 100644
index 0000000..d2524bf
--- /dev/null
+++ b/templates/rethinkdb/0/rancher-compose.yml
@@ -0,0 +1,34 @@
+.catalog:
+  name: "RethinkDB"
+  version: "2.3.5"
+  description: "(Experimental) NoSQL-Database"
+  uuid: rethinkdb-0
+  questions:
+    - variable: "rethinkdb_proxy_webport"
+      description: ""
+      label: "Proxy Web Port (Admin Panel):"
+      required: true
+      type: "int"
+      default: 8080
+    - variable: "rethinkdb_proxy_queryport"
+      description: ""
+      label: "Proxy Query Port:"
+      required: true
+      type: "int"
+      default: 28015
+    - variable: "rethinkdb_volume_driver"
+      description: ""
+      label: "Volume Driver:"
+      required: true
+      type: "string"
+      default: "local"
+
+
+version: '2'
+services:
+  rethinkdb:
+    scale: 1
+    start_on_create: true
+  rethinkdb-proxy:
+    scale: 1
+    start_on_create: true
diff --git a/templates/rethinkdb/catalogIcon-rethinkdb.svg b/templates/rethinkdb/catalogIcon-rethinkdb.svg
new file mode 100644
index 0000000..30c8eea
--- /dev/null
+++ b/templates/rethinkdb/catalogIcon-rethinkdb.svg
@@ -0,0 +1 @@
+<svg width="2500" height="400" viewBox="0 0 512 82" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M0 78.994v-5.295c0-1.081.54-1.621 1.62-1.621h5.62V15.885H1.62c-1.08 0-1.62-.54-1.62-1.62V8.86c0-1.08.54-1.62 1.62-1.62 9.222-.433 16.895-.65 23.018-.65 18.731 0 28.096 6.7 28.096 20.1 0 4.683-1.188 8.808-3.566 12.374-2.377 3.566-5.547 6.285-9.51 8.158l12.644 24.855h6.7c1.08 0 1.621.54 1.621 1.62v5.296c0 1.08-.54 1.62-1.62 1.62H44.737c-1.08 0-1.873-.468-2.378-1.404L27.664 50.14h-2.161c-2.306 0-4.359-.108-6.16-.324v22.26h6.808c1.08 0 1.621.541 1.621 1.622v5.295c0 1.08-.54 1.62-1.62 1.62H1.62c-1.08 0-1.621-.54-1.621-1.62zM19.343 15.56v26.043c.577.072 1.405.108 2.486.108 5.835 0 10.374-1.153 13.615-3.458 3.242-2.305 4.863-5.763 4.863-10.374 0-8.213-5.69-12.319-17.074-12.319h-3.89zm71.538 66.35c-8.573 0-14.859-2.503-18.857-7.51-3.999-5.007-5.998-11.635-5.998-19.883 0-8.25 2.125-15.075 6.376-20.478 4.25-5.403 10.374-8.105 18.37-8.105 3.963 0 7.367.738 10.212 2.215 2.846 1.477 5.025 3.476 6.538 5.998 2.882 4.899 4.323 10.554 4.323 16.966 0 3.025-.144 4.682-.433 4.97-.288.289-.828.433-1.62.433h-31.77c.36 5.187 1.638 9.203 3.835 12.049 2.198 2.845 5.998 4.268 11.4 4.268 3.963 0 8.034-.936 12.212-2.81 1.009-.504 1.729-.216 2.161.865l2.053 4.97c.36.865.036 1.586-.972 2.162-4.755 2.594-10.698 3.89-17.83 3.89zm-12.86-33.39h22.477c.144-9.006-3.386-13.509-10.59-13.509-4.25 0-7.258 1.351-9.023 4.053-1.765 2.701-2.72 5.853-2.864 9.455zm58.57-12.536v27.232c0 3.386.432 5.835 1.297 7.348.864 1.513 2.485 2.27 4.863 2.27 2.377 0 4.682-.505 6.916-1.514.792-.288 1.368 0 1.729.865l1.945 4.97c.072.217.108.523.108.92 0 .395-.36.81-1.08 1.242-3.459 1.729-7.565 2.593-12.32 2.593-6.412 0-10.626-1.657-12.643-4.97-1.441-2.162-2.27-4.251-2.486-6.268a82.652 82.652 0 0 1-.432-8.645V35.985h-6.16c-1.08 0-1.62-.54-1.62-1.621v-5.62c0-1.08.54-1.62 1.62-1.62h6.16V12.535c0-1.08.54-1.62 1.62-1.62h8.862c1.08 0 1.621.54 1.621 1.62v14.589h10.914c1.08 0 1.621.54 1.621 1.62v5.62c0 1.08-.54 1.62-1.62 1.62H136.59zM157.123 7.24V1.62c0-1.08.54-1.62 1.62-1.62h16.318c1.08 0 1.621.54 1.621 1.62v33.284c4.034-5.98 9.618-8.969 16.75-8.969 11.166 0 16.75 6.123 16.75 18.37v27.773h6.375c1.08 0 1.621.54 1.621 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-23.666c-1.081 0-1.621-.54-1.621-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h5.188v-22.37c0-4.538-.577-7.852-1.73-9.941-1.152-2.09-3.53-3.134-7.132-3.134s-6.591 1.08-8.969 3.242c-2.377 2.161-3.566 4.61-3.566 7.348v24.855h6.592c1.08 0 1.62.54 1.62 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-24.53c-1.08 0-1.621-.54-1.621-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h5.836V8.86h-5.835c-1.08 0-1.621-.54-1.621-1.62zm84.829 64.838h6.808c1.08 0 1.62.54 1.62 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-25.72c-1.08 0-1.62-.54-1.62-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h6.809V35.985h-5.835c-1.081 0-1.621-.54-1.621-1.621v-5.62c0-1.08.54-1.62 1.62-1.62h16.318c1.08 0 1.62.54 1.62 1.62v43.334zm-15.129-60.083c0-2.233.703-4.088 2.107-5.565 1.405-1.477 3.278-2.216 5.62-2.216 2.341 0 4.214.739 5.619 2.216 1.405 1.477 2.107 3.332 2.107 5.565 0 2.233-.72 4.07-2.161 5.511-1.441 1.441-3.332 2.161-5.673 2.161-2.342 0-4.197-.72-5.566-2.16-1.368-1.442-2.053-3.279-2.053-5.512zm27.34 22.477v-5.727c0-1.081.54-1.621 1.62-1.621h14.697c.937 0 1.513.54 1.73 1.62l.972 6.268c4.034-6.051 9.798-9.077 17.29-9.077 11.166 0 16.75 6.123 16.75 18.37v27.773h6.267c1.08 0 1.621.54 1.621 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-23.558c-1.081 0-1.621-.54-1.621-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h5.188v-22.37c0-4.538-.577-7.852-1.73-9.941-1.152-2.09-3.53-3.134-7.132-3.134s-6.591 1.08-8.969 3.242c-2.377 2.161-3.566 4.61-3.566 7.348v24.855h6.7c1.08 0 1.621.54 1.621 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-24.531c-1.08 0-1.621-.54-1.621-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h5.728V35.985h-5.835c-1.08 0-1.621-.504-1.621-1.513zM338.992 1.62v43.117h5.511l16.75-16.426c.792-.792 1.729-1.188 2.81-1.188h8.428c1.081 0 1.621.54 1.621 1.62v5.62c0 1.08-.54 1.62-1.62 1.62H365.9l-11.887 11.563 14.804 24.53h6.376c1.08 0 1.62.541 1.62 1.622v5.295c0 1.08-.54 1.62-1.62 1.62h-13.94c-1.009 0-1.837-.468-2.486-1.404l-16.209-26.151h-3.566v19.019h5.727c1.08 0 1.621.54 1.621 1.62v5.296c0 1.08-.54 1.62-1.62 1.62h-23.558c-1.081 0-1.621-.54-1.621-1.62v-5.295c0-1.081.54-1.621 1.62-1.621h5.728V8.753h-5.835c-1.081 0-1.621-.54-1.621-1.62V1.62c0-1.08.54-1.621 1.62-1.621h16.318c1.08 0 1.621.54 1.621 1.62zm44.846 5.62c9.221-.433 16.065-.65 20.532-.65 4.466 0 7.798.09 9.996.271 2.197.18 4.7.558 7.51 1.135 2.81.576 5.313 1.35 7.51 2.323 2.198.973 4.413 2.36 6.646 4.16a25.814 25.814 0 0 1 5.62 6.268c3.313 5.475 4.97 12.535 4.97 21.18 0 13.04-3.602 22.747-10.806 29.123-7.204 6.376-17.038 9.564-29.501 9.564h-22.477c-1.08 0-1.621-.54-1.621-1.621v-5.295c0-1.081.54-1.621 1.62-1.621h5.62V15.993h-5.62c-1.08 0-1.62-.54-1.62-1.62V8.86c0-1.08.54-1.62 1.62-1.62zm43.279 57.164c4.358-5.187 6.538-12.283 6.538-21.288s-2.035-15.85-6.106-20.532c-4.07-4.683-10.428-7.024-19.073-7.024h-6.916v56.625h7.132c7.925 0 14.066-2.594 18.425-7.78zm28.366 14.589v-5.295c0-1.081.54-1.621 1.621-1.621h5.728V15.993h-5.62c-1.08 0-1.62-.54-1.62-1.62V8.86c0-1.153.54-1.729 1.62-1.729 8.645-.36 16.858-.54 24.639-.54 7.78 0 13.994 1.495 18.64 4.484 4.647 2.99 6.97 7.259 6.97 12.806 0 4.034-1.242 7.546-3.728 10.536-2.485 2.99-5.42 5.169-8.807 6.538 5.547.864 9.78 2.917 12.697 6.16 2.918 3.241 4.377 7.203 4.377 11.886 0 6.124-2.27 11.076-6.808 14.859-4.539 3.782-10.554 5.925-18.046 6.43-3.098.216-8.069.324-14.913.324h-15.129c-1.08 0-1.62-.54-1.62-1.621zm19.452-32.42v25.72h4.862c6.34 0 11.257-1.009 14.75-3.026 3.495-2.017 5.242-5.511 5.242-10.482 0-8.14-5.691-12.211-17.074-12.211h-7.78zm0-31.23v22.262h4.106c10.662 0 15.993-3.71 15.993-11.13 0-4.18-1.297-7.079-3.89-8.7-2.594-1.62-6.304-2.431-11.13-2.431h-5.08z" fill="#204956"/></svg>
\ No newline at end of file
diff --git a/templates/rethinkdb/config.yml b/templates/rethinkdb/config.yml
new file mode 100644
index 0000000..47783fa
--- /dev/null
+++ b/templates/rethinkdb/config.yml
@@ -0,0 +1,5 @@
+name: RethinkDB Cluster
+description: |
+  (Experimental) NoSQL-Database
+version: 2.3.5
+category: Databases