diff --git a/mesos-templates/chronos/0/rancher-compose.yml b/mesos-templates/chronos/0/rancher-compose.yml
index cff11ea..6916fa1 100644
--- a/mesos-templates/chronos/0/rancher-compose.yml
+++ b/mesos-templates/chronos/0/rancher-compose.yml
@@ -1,6 +1,8 @@
 .catalog:
   name: Chronos
   version: v1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
   description: |
     Distributed, fault-tolerant cron
   questions:
diff --git a/mesos-templates/chronos/1/docker-compose.yml b/mesos-templates/chronos/1/docker-compose.yml
new file mode 100644
index 0000000..4c4dac9
--- /dev/null
+++ b/mesos-templates/chronos/1/docker-compose.yml
@@ -0,0 +1,11 @@
+chronos:
+  image: rancher/chronos:latest
+  environment:
+    ZK_SERVICE: mesos/zookeeper
+    MESOS_SERVICE: mesos/mesos-master
+    CHRONOS_HTTP_PORT: ${CHRONOS_HTTP_PORT}
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+  - "${CHRONOS_HTTP_PORT}:${CHRONOS_HTTP_PORT}"
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/chronos/1/rancher-compose.yml b/mesos-templates/chronos/1/rancher-compose.yml
new file mode 100644
index 0000000..1da6fae
--- /dev/null
+++ b/mesos-templates/chronos/1/rancher-compose.yml
@@ -0,0 +1,22 @@
+.catalog:
+  name: Chronos
+  version: v2
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  description: |
+    Distributed, fault-tolerant cron
+  questions:
+  - variable: CHRONOS_HTTP_PORT
+    description: Port to expose Chronos on.
+    label: Chronos Port
+    required: true
+    type: int
+    default: 8080
+chronos:
+  scale: 1
+  health_check:
+    port: ${CHRONOS_HTTP_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/'
+    response_timeout: 2000
diff --git a/mesos-templates/chronos/config.yml b/mesos-templates/chronos/config.yml
index dc8435c..52ab87d 100644
--- a/mesos-templates/chronos/config.yml
+++ b/mesos-templates/chronos/config.yml
@@ -1,7 +1,6 @@
 name: Chronos
 description: |
   Distributed, fault-tolerant cron replacement
-version: v1
+version: v2
 category: Frameworks
-maintainer: James Oliver <joliver@rancher.com>
 minimum_rancher_version: v1.0.0
diff --git a/mesos-templates/elasticsearch/0/rancher-compose.yml b/mesos-templates/elasticsearch/0/rancher-compose.yml
index 8115020..b6e0cbc 100644
--- a/mesos-templates/elasticsearch/0/rancher-compose.yml
+++ b/mesos-templates/elasticsearch/0/rancher-compose.yml
@@ -1,6 +1,8 @@
 .catalog:
   name: Elasticsearch
   version: v1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
   description: |
     You know, for search
   questions:
diff --git a/mesos-templates/elasticsearch/1/docker-compose.yml b/mesos-templates/elasticsearch/1/docker-compose.yml
new file mode 100644
index 0000000..e983eaa
--- /dev/null
+++ b/mesos-templates/elasticsearch/1/docker-compose.yml
@@ -0,0 +1,13 @@
+scheduler:
+  image: rancher/elasticsearch:latest
+  environment:
+    ZK_SERVICE: mesos/zookeeper
+    MESOS_SERVICE: mesos/mesos-master
+    SCHEDULER_PORT: ${SCHEDULER_PORT}
+    JAVA_OPTS: -Xms256M -Xmx256M
+    NODE_COUNT: ${NODE_COUNT}
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+  - "${SCHEDULER_PORT}:${SCHEDULER_PORT}"
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/elasticsearch/1/rancher-compose.yml b/mesos-templates/elasticsearch/1/rancher-compose.yml
new file mode 100644
index 0000000..ed1b082
--- /dev/null
+++ b/mesos-templates/elasticsearch/1/rancher-compose.yml
@@ -0,0 +1,28 @@
+.catalog:
+  name: Elasticsearch
+  version: v2
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  description: |
+    You know, for search
+  questions:
+  - variable: SCHEDULER_PORT
+    description: Port to expose scheduler on.
+    label: Scheduler Port
+    required: true
+    type: int
+    default: 31100
+  - variable: NODE_COUNT
+    description: Number of Elasticsearch instances to run.
+    label: Node Count
+    required: true
+    type: int
+    default: 3
+scheduler:
+  scale: 1
+  health_check:
+    port: ${SCHEDULER_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/'
+    response_timeout: 2000
diff --git a/mesos-templates/elasticsearch/config.yml b/mesos-templates/elasticsearch/config.yml
index dfcce46..dee0477 100644
--- a/mesos-templates/elasticsearch/config.yml
+++ b/mesos-templates/elasticsearch/config.yml
@@ -1,7 +1,6 @@
 name: Elasticsearch
 description: |
   You know, for search
-version: v1
+version: v2
 category: Frameworks
-maintainer: James Oliver <joliver@rancher.com>
 minimum_rancher_version: v1.0.0
diff --git a/mesos-templates/kafka/0/rancher-compose.yml b/mesos-templates/kafka/0/rancher-compose.yml
index ab25f20..5f113cf 100644
--- a/mesos-templates/kafka/0/rancher-compose.yml
+++ b/mesos-templates/kafka/0/rancher-compose.yml
@@ -1,6 +1,8 @@
 .catalog:
   name: Kafka
   version: v1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
   description: |
     A high-throughput distributed messaging system
   questions:
diff --git a/mesos-templates/kafka/1/docker-compose.yml b/mesos-templates/kafka/1/docker-compose.yml
new file mode 100644
index 0000000..001adc8
--- /dev/null
+++ b/mesos-templates/kafka/1/docker-compose.yml
@@ -0,0 +1,11 @@
+scheduler:
+  image: rancher/kafka:latest
+  environment:
+    ZK_SERVICE: mesos/zookeeper
+    MESOS_SERVICE: mesos/mesos-master
+    SCHEDULER_PORT: ${SCHEDULER_PORT}
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+  - "${SCHEDULER_PORT}:${SCHEDULER_PORT}"
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/kafka/1/rancher-compose.yml b/mesos-templates/kafka/1/rancher-compose.yml
new file mode 100644
index 0000000..f3d0b35
--- /dev/null
+++ b/mesos-templates/kafka/1/rancher-compose.yml
@@ -0,0 +1,21 @@
+.catalog:
+  name: Kafka
+  version: v2
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  description: |
+    A high-throughput distributed messaging system
+  questions:
+  - variable: SCHEDULER_PORT
+    description: Port to expose Kafka Scheduler on.
+    label: Scheduler Port
+    required: true
+    type: int
+    default: 7000
+scheduler:
+  health_check:
+    port: ${SCHEDULER_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/health'
+    response_timeout: 2000
diff --git a/mesos-templates/kafka/config.yml b/mesos-templates/kafka/config.yml
index ead57e6..5c613d0 100644
--- a/mesos-templates/kafka/config.yml
+++ b/mesos-templates/kafka/config.yml
@@ -1,7 +1,6 @@
 name: Kafka
 description: |
   A high-throughput distributed messaging system
-version: v1
+version: v2
 category: Frameworks
-maintainer: James Oliver <joliver@rancher.com>
 minimum_rancher_version: v1.0.0
diff --git a/mesos-templates/marathon/0/rancher-compose.yml b/mesos-templates/marathon/0/rancher-compose.yml
index 08d7ee6..7f45f72 100644
--- a/mesos-templates/marathon/0/rancher-compose.yml
+++ b/mesos-templates/marathon/0/rancher-compose.yml
@@ -1,5 +1,7 @@
 .catalog:
   version: v1.1.0
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
   questions:
   - variable: MARATHON_HTTP_PORT
     description: Port to expose Marathon on.
diff --git a/mesos-templates/marathon/1/docker-compose.yml b/mesos-templates/marathon/1/docker-compose.yml
index bb3c19b..cde29dd 100644
--- a/mesos-templates/marathon/1/docker-compose.yml
+++ b/mesos-templates/marathon/1/docker-compose.yml
@@ -4,8 +4,6 @@ marathon:
     ZK_SERVICE: Mesos/zookeeper
     MESOS_SERVICE: Mesos/mesos-master
     MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
-  labels:
-    io.rancher.container.hostname_override: container_name
   ports:
   - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
-  privileged: true
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/marathon/1/rancher-compose.yml b/mesos-templates/marathon/1/rancher-compose.yml
index 805bdf2..538153a 100644
--- a/mesos-templates/marathon/1/rancher-compose.yml
+++ b/mesos-templates/marathon/1/rancher-compose.yml
@@ -1,5 +1,7 @@
 .catalog:
   version: v1.1.1
+  minimum_rancher_version: v1.0.0
+  maximum_rancher_version: v1.2.0-pre3
   questions:
   - variable: MARATHON_HTTP_PORT
     description: Port to expose Marathon on.
diff --git a/mesos-templates/marathon/2/docker-compose.yml b/mesos-templates/marathon/2/docker-compose.yml
new file mode 100644
index 0000000..6132846
--- /dev/null
+++ b/mesos-templates/marathon/2/docker-compose.yml
@@ -0,0 +1,11 @@
+marathon:
+  image: rancher/marathon:v1.1.1
+  environment:
+    ZK_SERVICE: mesos/zookeeper
+    MESOS_SERVICE: mesos/mesos-master
+    MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
+  labels:
+    io.rancher.container.hostname_override: container_name
+  ports:
+  - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/marathon/2/rancher-compose.yml b/mesos-templates/marathon/2/rancher-compose.yml
new file mode 100644
index 0000000..3bd9362
--- /dev/null
+++ b/mesos-templates/marathon/2/rancher-compose.yml
@@ -0,0 +1,19 @@
+.catalog:
+  version: v1.1.1-cni
+  minimum_rancher_version: v1.2.0-pre4-rc1
+  questions:
+  - variable: MARATHON_HTTP_PORT
+    description: Port to expose Marathon on.
+    label: Marathon Port
+    required: true
+    type: int
+    default: 8080
+marathon:
+  scale: 1
+  health_check:
+    port: ${MARATHON_HTTP_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/'
+    response_timeout: 2000
diff --git a/mesos-templates/marathon/config.yml b/mesos-templates/marathon/config.yml
index 5963a5f..30ae8df 100644
--- a/mesos-templates/marathon/config.yml
+++ b/mesos-templates/marathon/config.yml
@@ -1,7 +1,6 @@
 name: Marathon
 description: |
   A production-grade container orchestration platform
-version: v1.1.1
+version: v1.1.1-cni
 category: Frameworks
-maintainer: James Oliver <joliver@rancher.com>
 minimum_rancher_version: v1.0.0
\ No newline at end of file