diff --git a/templates/sentry/0/README.md b/templates/sentry/0/README.md
new file mode 100644
index 0000000..c35b928
--- /dev/null
+++ b/templates/sentry/0/README.md
@@ -0,0 +1,20 @@
+# Sentry
+
+
+### Info:
+ This templates creates a complete [sentry](https://github.com/getsentry/sentry) setup including postgres and redis servers.
+
+ Images are the offical images from:
+ * Sentry: [https://hub.docker.com/_/sentry/](https://hub.docker.com/_/sentry/)
+ * Postgres: [https://hub.docker.com/_/postgres/](https://hub.docker.com/_/postgres/)
+ * Redis: [https://hub.docker.com/_/redis/](https://hub.docker.com/_/redis/)
+
+### Usage:
+
+ * Select Sentry from catalog.
+
+ * Required: Enter a sentry secret
+
+ * Optional: Email configuration
+
+ * Click deploy.
diff --git a/templates/sentry/0/docker-compose.yml b/templates/sentry/0/docker-compose.yml
new file mode 100644
index 0000000..ee4aced
--- /dev/null
+++ b/templates/sentry/0/docker-compose.yml
@@ -0,0 +1,91 @@
+sentry-postgres:
+  environment:
+    POSTGRES_USER: sentry
+    POSTGRES_PASSWORD: secret
+    PGDATA: /data/postgres/data
+  log_driver: ''
+  labels:
+    io.rancher.scheduler.global: 'true'
+    io.rancher.container.pull_image: always
+  tty: true
+  log_opt: {}
+  image: postgres:9.5.3
+  stdin_open: true
+sentry-cron:
+  environment:
+    SENTRY_EMAIL_HOST: ${sentry_email_host}
+    SENTRY_EMAIL_PASSWORD: ${sentry_email_password}
+    SENTRY_EMAIL_PORT: '${sentry_email_port}'
+    SENTRY_EMAIL_USER: ${sentry_email_user}
+    SENTRY_SECRET_KEY: ${sentry_secret_key}
+    SENTRY_SERVER_EMAIL: ${sentry_server_email}
+  log_driver: ''
+  labels:
+    io.rancher.scheduler.global: 'true'
+    io.rancher.container.pull_image: always
+  tty: true
+  command:
+  - run
+  - cron
+  log_opt: {}
+  image: sentry:8.5.0
+  links:
+  - sentry-postgres:postgres
+  - sentry-redis:redis
+  stdin_open: true
+sentry-redis:
+  log_driver: ''
+  labels:
+    io.rancher.scheduler.global: 'true'
+    io.rancher.container.pull_image: always
+  tty: true
+  log_opt: {}
+  image: redis:3.2.0-alpine
+  stdin_open: true
+sentry:
+  ports:
+  - ${sentry_public_port}:9000/tcp
+  environment:
+    SENTRY_EMAIL_HOST: ${sentry_email_host}
+    SENTRY_EMAIL_PASSWORD: ${sentry_email_password}
+    SENTRY_EMAIL_PORT: '${sentry_email_port}'
+    SENTRY_EMAIL_USER: ${sentry_email_user}
+    SENTRY_SECRET_KEY: ${sentry_secret_key}
+    SENTRY_SERVER_EMAIL: ${sentry_server_email}
+  log_driver: ''
+  labels:
+    io.rancher.scheduler.global: 'true'
+    io.rancher.container.pull_image: always
+  tty: true
+  command:
+  - /bin/bash
+  - -c
+  - sentry upgrade --noinput && sentry createuser --email ${sentry_inital_user_email} --password ${sentry_inital_user_password} --superuser && /entrypoint.sh run web || /entrypoint.sh run web
+  log_opt: {}
+  image: sentry:8.5.0
+  links:
+  - sentry-postgres:postgres
+  - sentry-redis:redis
+  stdin_open: true
+sentry-worker:
+  environment:
+    SENTRY_EMAIL_HOST: ${sentry_email_host}
+    SENTRY_EMAIL_PASSWORD: ${sentry_email_password}
+    SENTRY_EMAIL_PORT: '${sentry_email_port}'
+    SENTRY_EMAIL_USER: ${sentry_email_user}
+    SENTRY_SECRET_KEY: ${sentry_secret_key}
+    SENTRY_SERVER_EMAIL: ${sentry_server_email}
+  log_driver: ''
+  labels:
+    io.rancher.scheduler.global: 'true'
+    io.rancher.container.pull_image: always
+  tty: true
+  command:
+  - run
+  - worker
+  log_opt: {}
+  image: sentry:8.5.0
+  links:
+  - sentry-postgres:postgres
+  - sentry-redis:redis
+  stdin_open: true
diff --git a/templates/sentry/0/rancher-compose.yml b/templates/sentry/0/rancher-compose.yml
new file mode 100644
index 0000000..412d1c3
--- /dev/null
+++ b/templates/sentry/0/rancher-compose.yml
@@ -0,0 +1,65 @@
+.catalog:
+  name: Sentry
+  version: 8.5.0
+  description: Sentry is a realtime event logging and aggregation platform
+
+  questions:
+    - variable: "sentry_secret_key"
+      type: "password"
+      required: true
+      label: "SENTRY_SECRET_KEY"
+      description: "A secret key used for cryptographic functions within Sentry. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_public_port"
+      type: "int"
+      required: false
+      label: "Sentry public port"
+      description: "Port that Sentry will listen on. Alternatively you could point a load balancer to the port 9000 of this container"
+
+    - variable: "sentry_inital_user_email"
+      type: "string"
+      required: true
+      label: "SENTRY_INITAL_USER_EMAIL"
+      description: "The initial superuser email"
+
+    - variable: "sentry_inital_user_password"
+      type: "password"
+      required: true
+      label: "SENTRY_INITAL_USER_PASSWORD"
+      description: "The initial superuser password. Please use a simple intial password and change it afterwards in the Sentry interface"
+
+    - variable: "sentry_server_email"
+      type: "string"
+      required: false
+      label: "SENTRY_SERVER_EMAIL"
+      description: "The smtp server address. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_email_host"
+      type: "string"
+      required: false
+      label: "SENTRY_EMAIL_HOST"
+      description: "The smtp server address. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_email_user"
+      type: "string"
+      required: false
+      label: "SENTRY_EMAIL_USER"
+      description: "The username for the email account. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_email_password"
+      type: "password"
+      required: false
+      label: "SENTRY_EMAIL_PASSWORD"
+      description: "The password for the email account. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_email_password"
+      type: "string"
+      required: false
+      label: "SENTRY_EMAIL_PASSWORD"
+      description: "The password for the email account. see https://hub.docker.com/_/sentry/ for more info"
+
+    - variable: "sentry_email_port"
+      type: "int"
+      required: false
+      label: "SENTRY_EMAIL_PORT"
+      description: "Port of the smtp server. see https://hub.docker.com/_/sentry/ for more info"
diff --git a/templates/sentry/catalogIcon-sentry.png b/templates/sentry/catalogIcon-sentry.png
new file mode 100644
index 0000000..8c71e81
Binary files /dev/null and b/templates/sentry/catalogIcon-sentry.png differ
diff --git a/templates/sentry/config.yml b/templates/sentry/config.yml
new file mode 100644
index 0000000..4b8a9f2
--- /dev/null
+++ b/templates/sentry/config.yml
@@ -0,0 +1,4 @@
+name: Sentry
+version: 8.5.0
+description: Sentry is a realtime event logging and aggregation platform
+category: Error Tracking