diff --git a/kubernetes-templates/rabbitmq/0/README.md b/kubernetes-templates/rabbitmq/0/README.md
new file mode 100644
index 0000000..3405e06
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/0/README.md
@@ -0,0 +1,3 @@
+# RabbitMQ
+
+This Chart provides a basic RabbitMQ instance running in kubernetes.
diff --git a/kubernetes-templates/rabbitmq/0/rabbitmq-rc.yaml b/kubernetes-templates/rabbitmq/0/rabbitmq-rc.yaml
new file mode 100644
index 0000000..3005eff
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/0/rabbitmq-rc.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: rabbitmq
+  labels:
+    provider: rabbitmq
+    heritage: helm
+spec:
+  replicas: ${REPLICAS}
+  template:
+    metadata:
+      labels:
+        provider: rabbitmq
+    spec:
+      containers:
+      - name: rabbitmq
+        image: rabbitmq:3.6.0
+        ports:
+        - containerPort: 5672
diff --git a/kubernetes-templates/rabbitmq/0/rabbitmq-svc.yaml b/kubernetes-templates/rabbitmq/0/rabbitmq-svc.yaml
new file mode 100644
index 0000000..58a0325
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/0/rabbitmq-svc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: rabbitmq
+  labels:
+    provider: rabbitmq
+    heritage: helm
+spec:
+  ports:
+  - port: ${SERVICE_PORT}
+    targetPort: 5672
+  selector:
+    provider: rabbitmq
diff --git a/kubernetes-templates/rabbitmq/0/rancher-compose.yml b/kubernetes-templates/rabbitmq/0/rancher-compose.yml
new file mode 100644
index 0000000..3cfc00e
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/0/rancher-compose.yml
@@ -0,0 +1,19 @@
+.catalog:
+  name: RabbitMQ
+  version: 3.6.0-rancher1
+  description: A reliable, distributed messaging broker
+  questions:
+    - variable: REPLICAS
+      default: 1
+      min: 1
+      max: 1
+      label: Server Replicas
+      description: Initial number of server replicas
+      required: true
+      type: int
+    - variable: SERVICE_PORT
+      default: 5672
+      label: Service port
+      description: Port to expose the service on
+      required: true
+      type: int
diff --git a/kubernetes-templates/rabbitmq/catalogIcon-rabbitmq.svg b/kubernetes-templates/rabbitmq/catalogIcon-rabbitmq.svg
new file mode 100644
index 0000000..cf9c15c
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/catalogIcon-rabbitmq.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="271px" viewBox="0 0 256 271" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M245.44,108.307692 L160.349538,108.307692 C156.081231,108.307692 152.615385,104.841846 152.615385,100.573538 L152.615385,11.8941538 C152.615385,5.32676923 147.288615,0 140.726154,0 L110.350769,0 C103.783385,0 98.4615385,5.32676923 98.4615385,11.8941538 L98.4615385,100.036923 C98.4615385,104.610462 94.7643077,108.327385 90.1907692,108.347077 L62.3064615,108.48 C57.6935385,108.504615 53.9470769,104.763077 53.9569231,100.155077 L54.1292308,11.9138462 C54.144,5.33661538 48.8172308,0 42.24,0 L11.8892308,0 C5.32184615,0 0,5.32676923 0,11.8941538 L0,260.209231 C0,266.043077 4.72615385,270.769231 10.5550769,270.769231 L245.44,270.769231 C251.273846,270.769231 256,266.043077 256,260.209231 L256,118.867692 C256,113.033846 251.273846,108.307692 245.44,108.307692 L245.44,108.307692 Z M205.538462,201.540923 C205.538462,209.186462 199.340308,215.384615 191.694769,215.384615 L167.689846,215.384615 C160.044308,215.384615 153.846154,209.186462 153.846154,201.540923 L153.846154,177.536 C153.846154,169.890462 160.044308,163.692308 167.689846,163.692308 L191.694769,163.692308 C199.340308,163.692308 205.538462,169.890462 205.538462,177.536 L205.538462,201.540923 L205.538462,201.540923 Z" fill="#FF6600"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/kubernetes-templates/rabbitmq/config.yml b/kubernetes-templates/rabbitmq/config.yml
new file mode 100644
index 0000000..4b6e6e0
--- /dev/null
+++ b/kubernetes-templates/rabbitmq/config.yml
@@ -0,0 +1,5 @@
+name: RabbitMQ
+version: 3.6.0-rancher1
+maintainer: Matt Fisher <mfisher@deis.com>
+category: Messaging
+description: A reliable, distributed messaging broker