diff --git a/templates/rabbitmq-3/0/README.md b/templates/rabbitmq-3/0/README.md
new file mode 100644
index 0000000..3f6151f
--- /dev/null
+++ b/templates/rabbitmq-3/0/README.md
@@ -0,0 +1,6 @@
+RabbitMQ 3.6.1 with easy Rancher clustering
+===
+Provides RabbitMQ image that can scale to a cluster.
+
+TODO: 
+* avoid deployment on a node where the service is already present
diff --git a/templates/rabbitmq-3/0/docker-compose.yml b/templates/rabbitmq-3/0/docker-compose.yml
new file mode 100755
index 0000000..8914e55
--- /dev/null
+++ b/templates/rabbitmq-3/0/docker-compose.yml
@@ -0,0 +1,27 @@
+rabbitmq:
+  image: rancher/rabbitmq-conf:v0.1.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: rabbitmq-base,rabbitmq-datavolume
+  volumes_from:
+    - rabbitmq-datavolume
+rabbitmq-datavolume:
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.container.start_once: true
+  volumes:
+    - /etc/rabbitmq
+    - /opt/rancher/bin
+  entrypoint: /bin/true
+  image: rabbitmq:3.6.1-management
+rabbitmq-base:
+  labels:
+    io.rancher.container.hostname_override: container_name
+  image: rabbitmq:3.6.1-management
+  volumes_from:
+    - rabbitmq-datavolume
+  net: "container:rabbitmq"
+  entrypoint:
+    - /opt/rancher/bin/run.sh
+  environment:
+    - RABBITMQ_ERLANG_COOKIE=secretcookie
diff --git a/templates/rabbitmq-3/0/rancher-compose.yml b/templates/rabbitmq-3/0/rancher-compose.yml
new file mode 100755
index 0000000..9584a8f
--- /dev/null
+++ b/templates/rabbitmq-3/0/rancher-compose.yml
@@ -0,0 +1,10 @@
+.catalog:
+  name: "Rabbit MQ"
+  version: "0.1.0"
+  decription: A reliable, distributed messaging broker
+rabbitmq:
+  metadata:
+    rabbitmq:
+      config:
+       node.name: "$${HOSTNAME}"
+
diff --git a/templates/rabbitmq-3/catalogIcon-rabbitmq.png b/templates/rabbitmq-3/catalogIcon-rabbitmq.png
new file mode 100755
index 0000000..f458f7f
Binary files /dev/null and b/templates/rabbitmq-3/catalogIcon-rabbitmq.png differ
diff --git a/templates/rabbitmq-3/config.yml b/templates/rabbitmq-3/config.yml
new file mode 100755
index 0000000..edd833f
--- /dev/null
+++ b/templates/rabbitmq-3/config.yml
@@ -0,0 +1,5 @@
+name: RabbitMQ 3.6.1
+description: |
+  Robust messaging for applications 
+version: 0.1.0
+category: Message queues