diff --git a/templates/zammad/2/docker-compose.yml b/templates/zammad/2/docker-compose.yml
new file mode 100644
index 0000000..99f8d09
--- /dev/null
+++ b/templates/zammad/2/docker-compose.yml
@@ -0,0 +1,106 @@
+version: '3.3'
+
+services:
+
+  zammad:
+    depends_on:
+      - zammad-elasticsearch
+      - zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad
+    labels:
+      io.rancher.container.pull_image: always
+      io.rancher.container.start_once: 'true'
+    restart: on-failure
+    volumes:
+      - data-zammad:/home/zammad
+
+  zammad-backup:
+    depends_on:
+      - zammad
+    image: zammad/zammad-docker-compose:zammad-backup
+    labels:
+      io.rancher.container.pull_image: always
+    links:
+      - zammad-postgresql
+    restart: always
+    volumes:
+      - data-zammad:/home/zammad
+      - backup-zammad:/var/tmp/zammad
+
+  zammad-elasticsearch:
+    image: zammad/zammad-docker-compose:zammad-elasticsearch
+    labels:
+      io.rancher.container.pull_image: always
+    restart: always
+    volumes:
+      - data-elasticsearch:/usr/share/elasticsearch/data
+
+  zammad-nginx:
+    depends_on:
+      - zammad
+    image: zammad/zammad-docker-compose:zammad-nginx
+    labels:
+      io.rancher.container.pull_image: always
+    links:
+      - zammad-railsserver
+      - zammad-websocket
+    ports:
+      - "80:80"
+    restart: always
+    volumes:
+      - data-zammad:/home/zammad
+
+  zammad-postgresql:
+    image: zammad/zammad-docker-compose:zammad-postgresql
+    labels:
+      io.rancher.container.pull_image: always
+    restart: always
+
+  zammad-railsserver:
+    depends_on:
+      - zammad
+    image: zammad/zammad-docker-compose:zammad-railsserver
+    labels:
+      io.rancher.container.pull_image: always
+    links:
+      - zammad-elasticsearch
+      - zammad-postgresql
+    depends_on:
+      - zammad
+    restart: always
+    volumes:
+      - data-zammad:/home/zammad
+
+  zammad-scheduler:
+    depends_on:
+      - zammad
+    image: zammad/zammad-docker-compose:zammad-scheduler
+    labels:
+      io.rancher.container.pull_image: always
+    links:
+      - zammad-elasticsearch
+      - zammad-postgresql
+    restart: always
+    volumes:
+      - data-zammad:/home/zammad
+
+  zammad-websocket:
+    depends_on:
+      - zammad
+    image: zammad/zammad-docker-compose:zammad-websocket
+    labels:
+      io.rancher.container.pull_image: always
+    links:
+      - zammad-postgresql
+      - zammad
+    restart: always
+    volumes:
+      - data-zammad:/home/zammad
+
+volumes:
+  backup-zammad:
+    driver: local
+  data-zammad:
+    driver: local
+  data-elasticsearch:
+    driver: local
diff --git a/templates/zammad/2/rancher-compose.yml b/templates/zammad/2/rancher-compose.yml
new file mode 100644
index 0000000..dcca4eb
--- /dev/null
+++ b/templates/zammad/2/rancher-compose.yml
@@ -0,0 +1,39 @@
+.catalog:
+  name: "Zammad"
+  version: "1.4"
+  description: "Zammad is a web based open source helpdesk/customer support system"
+  uuid: zammad-1
+  minimum_rancher_version: v1.2.0
+  questions:
+
+  zammad:
+    scale: 1
+    start_on_create: true
+
+  zammad-backup:
+    scale: 1
+    start_on_create: true
+
+  zammad-elasticsearch:
+    scale: 1
+    start_on_create: true
+
+  zammad-nginx:
+    scale: 1
+    start_on_create: true
+
+  zammad-postgresql:
+    scale: 1
+    start_on_create: true
+
+  zammad-scheduler:
+    scale: 1
+    start_on_create: true
+
+  zammad-railsserver:
+    scale: 1
+    start_on_create: true
+
+  zammad-websocket:
+    scale: 1
+    start_on_create: true
diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml
index b65d267..064e907 100644
--- a/templates/zammad/config.yml
+++ b/templates/zammad/config.yml
@@ -1,7 +1,7 @@
 name: Zammad
 description: |
   Zammad is a web based open source helpdesk/customer support system
-version: "1.3"
+version: "1.4"
 category: Ticketsystems
 maintainer: "Zammad Project <info@zammad.org>"
 projectURL: https://github.com/zammad/zammad