diff --git a/templates/etcd/0/README.md b/templates/etcd/0/README.md
new file mode 100644
index 0000000..f6263ec
--- /dev/null
+++ b/templates/etcd/0/README.md
@@ -0,0 +1,25 @@
+# etcd (Experimental)
+
+
+### Info:
+
+ This creates an N-node etcd cluster on top of Rancher. The bootstrap process is done statically, and the adjustment of cluster scale needs to be managed manually. The cluster is available for immediate use.
+ 
+ 
+### Usage:
+
+Select etcd the catalog page.
+
+Fill in the number of nodes desired. This should be an **ODD** number.
+
+Click deploy.
+
+Once the stack is deployed, you can access the cluster in your application via its IP or DNS addresses like so:
+
+
+```
+etcdctl -C http://10.42.16.231:2379,.... member list
+```
+ 
+ 
+ 
\ No newline at end of file
diff --git a/templates/etcd/0/docker-compose.yml b/templates/etcd/0/docker-compose.yml
new file mode 100644
index 0000000..d7b23e7
--- /dev/null
+++ b/templates/etcd/0/docker-compose.yml
@@ -0,0 +1,10 @@
+etcd:
+  image: rancher/etcd:v2.2.1-2
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+    - '4001'
+    - '2380'
+    - '2379'
+    - '7001'
+  command: /opt/rancher/run.sh
diff --git a/templates/etcd/0/rancher-compose.yml b/templates/etcd/0/rancher-compose.yml
new file mode 100644
index 0000000..a3aa02a
--- /dev/null
+++ b/templates/etcd/0/rancher-compose.yml
@@ -0,0 +1,15 @@
+.catalog:
+  name: "Etcd"
+  version: "2.2.1-rancher1"
+  description: |
+    (Experimental)Distributed reliable key-value store
+  minimum_rancher_version: "v0.46.0"
+  questions:
+    - variable: "scale"
+      description: "Number of Etcd nodes"
+      label: "Number of Nodes:"
+      required: true
+      default: 1
+      type: "int"
+etcd:
+  scale: "${scale}"
diff --git a/templates/etcd/catalogIcon-etcd.svg b/templates/etcd/catalogIcon-etcd.svg
new file mode 100644
index 0000000..5884e92
--- /dev/null
+++ b/templates/etcd/catalogIcon-etcd.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="235px" height="225px" viewBox="189.5 283.5 235 225" enable-background="new 189.5 283.5 235 225" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#419EDA" d="M296.544,384.038c0,8.063-6.533,14.585-14.585,14.585c-8.058,0-14.573-6.521-14.573-14.585
+			c0-8.029,6.516-14.576,14.573-14.576C290.011,369.462,296.544,376.009,296.544,384.038z"/>
+		<path fill="#419EDA" d="M315.39,384.038c0,8.063,6.534,14.585,14.586,14.585c8.05,0,14.577-6.521,14.577-14.585
+			c0-8.032-6.527-14.579-14.577-14.579C321.924,369.459,315.39,376.006,315.39,384.038z"/>
+		<path fill="#419EDA" d="M414.636,399.847c-1.05,0.088-2.105,0.129-3.226,0.129c-6.503,0-12.812-1.525-18.504-4.318
+			c1.895-10.871,2.701-21.823,2.49-32.735c-6.171-8.926-13.224-17.348-21.185-25.107c3.454-6.476,8.56-12.048,14.934-15.999
+			l2.737-1.692l-2.133-2.405c-10.988-12.373-24.102-21.939-38.97-28.43l-2.965-1.29l-0.753,3.134
+			c-1.773,7.304-5.479,13.893-10.567,19.181c-9.779-5.198-19.995-9.399-30.53-12.581c-10.51,3.175-20.708,7.364-30.483,12.554
+			c-5.067-5.281-8.764-11.854-10.53-19.137l-0.758-3.133l-2.954,1.284c-14.681,6.397-28.156,16.222-38.964,28.411l-2.139,2.41
+			l2.734,1.692c6.354,3.936,11.446,9.475,14.894,15.916c-7.937,7.729-14.982,16.124-21.148,25.009
+			c-0.24,10.907,0.525,21.939,2.429,32.96c-5.664,2.767-11.938,4.275-18.398,4.275c-1.134,0-2.195-0.041-3.226-0.127l-3.212-0.245
+			l0.301,3.207c1.574,16.225,6.612,31.657,14.982,45.872l1.634,2.774l2.453-2.082c5.685-4.822,12.554-8.015,19.858-9.302
+			c4.815,9.845,10.522,19.095,16.996,27.683c10.33,3.613,21.093,6.31,32.208,7.915c1.066,7.351,0.217,14.954-2.683,21.984
+			l-1.223,2.979l3.145,0.692c8.053,1.771,16.177,2.673,24.132,2.673l24.125-2.673l3.148-0.692l-1.226-2.985
+			c-2.892-7.03-3.741-14.642-2.675-21.994c11.071-1.606,21.794-4.297,32.086-7.899c6.48-8.595,12.192-17.851,17.015-27.709
+			c7.327,1.279,14.235,4.474,19.955,9.31l2.453,2.079l1.626-2.767c8.385-14.233,13.422-29.664,14.972-45.863l0.301-3.201
+			L414.636,399.847z M340.49,439.058c-11.413,3.104-23.004,4.671-34.526,4.671c-11.553,0-23.13-1.566-34.553-4.671
+			c-6.267-9.738-11.222-20.17-14.788-31.153c-3.551-10.932-5.629-22.385-6.232-34.178c7.377-9.121,15.766-17.111,25.035-23.837
+			c9.419-6.851,19.666-12.417,30.538-16.604c10.854,4.188,21.082,9.746,30.479,16.568c9.305,6.762,17.731,14.814,25.144,23.992
+			c-0.632,11.726-2.735,23.113-6.292,34.027C351.738,418.854,346.767,429.319,340.49,439.058z"/>
+	</g>
+</g>
+</svg>
diff --git a/templates/etcd/config.yml b/templates/etcd/config.yml
new file mode 100644
index 0000000..73ef4c3
--- /dev/null
+++ b/templates/etcd/config.yml
@@ -0,0 +1,5 @@
+name: Etcd
+description: |
+  (Experimental) A highly-available key value store
+version: 2.2.1-rancher1
+category: Clustering