diff --git a/templates/datadog/0/README.md b/templates/datadog/0/README.md
new file mode 100644
index 0000000..b141d24
--- /dev/null
+++ b/templates/datadog/0/README.md
@@ -0,0 +1,13 @@
+# DataDog Agent Service
+
+## Info
+Based on the official [Datadog Agent Docker image](github.com/DataDog/docker-dd-agent) with a few changes to the init script to better support the Rancher environment.
+
+## Notable Improvements
+* Hostname reported to DataDog is the actual name of the host (per Rancher Metadata service)
+* User can specify host labels which will be sent to DataDog as key:value tags for the host
+* User can either deploy the DogStat Agent globally on every host or deploy a single instance of a standalone DogStatsD
+* The later is useful if you just want a StatsD aggregator to which other services can send metrics
+
+[Github repository for the image](https://github.com/janeczku/dd-agent-rancher)
+[Docker Hub trusted image builds](https://hub.docker.com/r/janeczku/dd-agent-rancher)
diff --git a/templates/datadog/0/docker-compose.yml b/templates/datadog/0/docker-compose.yml
new file mode 100755
index 0000000..da22bbb
--- /dev/null
+++ b/templates/datadog/0/docker-compose.yml
@@ -0,0 +1,14 @@
+datadog-agent:
+  image: janeczku/dd-agent-rancher:11.0.563
+  restart: always
+  environment:
+    API_KEY: ${api_key}
+    DOGSTATSD_ONLY: ${statsd_standalone}
+    STATSD_METRIC_NAMESPACE: ${statsd_namespace}
+    HOST_LABELS: ${host_labels}
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - /proc/:/host/proc/:ro
+    - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
+  labels:
+    io.rancher.scheduler.global: ${global_service}
diff --git a/templates/datadog/0/rancher-compose.yml b/templates/datadog/0/rancher-compose.yml
new file mode 100755
index 0000000..fdf3fc9
--- /dev/null
+++ b/templates/datadog/0/rancher-compose.yml
@@ -0,0 +1,42 @@
+.catalog:
+  name: "DataDog"
+  version: "11.0.563-rancher1"
+  description: "Datadog Agent and DogStatsD"
+  minimum_rancher_version: v0.46.0
+  questions:
+    - variable: "api_key"
+      label: "DataDog Api Key"
+      description: "Your DataDog API key"
+      required: true
+      type: "string"
+    - variable: "host_labels"
+      label: "Host Labels to Tags"
+      description: |
+        Comma delimited list (no spaces) of host labels to set as DataDog key/value tags.
+        Example: 'provider,region'
+      required: false
+      type: "string"
+    - variable: "global_service"
+      label: "Global Service"
+      description: |
+        Enable this option to run an instance of the DataDog Agent on every host.
+        If you merely want a StatsD aggregator to which other services can send
+        metrics, then you may uncheck this and instead enable the Standalone mode.
+      required: true
+      type: "boolean"
+      default: true
+    - variable: "statsd_standalone"
+      label: "Standalone StatsD"
+      description: |
+        Enable this option to run only DogStatsD without the full Agent.
+        You can then send StatsD metrics to port 8125/udp of the service.
+      required: true
+      type: "boolean"
+      default: false
+    - variable: "statsd_namespace"
+      label: "StatsD Metric Namespace"
+      description: |
+        You may optionally set a namespace for all StatsD metrics aggregated by this service.
+        If set then 'metric.name' will become 'namespace.metric.name'.
+      required: false
+      type: "string"
diff --git a/templates/datadog/catalogIcon-datadog.svg b/templates/datadog/catalogIcon-datadog.svg
new file mode 100644
index 0000000..48947ad
--- /dev/null
+++ b/templates/datadog/catalogIcon-datadog.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
+<path id="Bits" fill-rule="evenodd" clip-rule="evenodd" fill="#774AA4" d="M350.2,268.3l-27.3-18.1l-22.8,38.1l-26.5-7.8
+	l-23.3,35.7l1.2,11.2l126.7-23.4l-7.4-79.4L350.2,268.3z M232,234l20.3-2.8c3.3,1.5,5.6,2,9.5,3.1c6.1,1.6,13.3,3.1,23.8-2.2
+	c2.5-1.2,7.6-5.9,9.6-8.6l83.3-15.2l8.5,103.2l-142.7,25.8L232,234z M386.7,196.8l-8.2,1.6L362.7,34.7L93.5,66l33.2,270l31.5-4.6
+	c-2.5-3.6-6.4-8-13.1-13.5c-9.3-7.7-6-20.9-0.5-29.2c7.2-14,44.6-31.8,42.4-54.2c-0.8-8.1-2-18.7-9.6-26c-0.3,3,0.2,5.9,0.2,5.9
+	s-3.1-4-4.6-9.4c-1.5-2.1-2.7-2.7-4.4-5.5c-1.2,3.2-1,6.9-1,6.9s-2.5-6-2.9-11.1c-1.5,2.3-1.9,6.6-1.9,6.6s-3.3-9.5-2.5-14.6
+	c-1.5-4.4-6-13.2-4.7-33.2c8.2,5.8,26.3,4.4,33.4-6c2.3-3.5,3.9-12.9-1.2-31.4c-3.3-11.9-11.4-29.6-14.6-36.4l-0.4,0.3
+	c1.7,5.4,5.1,16.8,6.4,22.3c4,16.7,5.1,22.5,3.2,30.2c-1.6,6.7-5.4,11.1-15.1,16c-9.7,4.9-22.6-7-23.4-7.7
+	c-9.4-7.5-16.7-19.8-17.5-25.8c-0.8-6.5,3.8-10.5,6.1-15.8c-3.3,1-7,2.6-7,2.6s4.4-4.6,9.9-8.6c2.3-1.5,3.6-2.5,6-4.4
+	c-3.4-0.1-6.2,0-6.2,0s5.7-3.1,11.7-5.4c-4.4-0.2-8.5,0-8.5,0s12.8-5.7,22.9-10c7-2.9,13.8-2,17.6,3.5c5,7.3,10.3,11.2,21.4,13.6
+	c6.9-3,8.9-4.6,17.5-7c7.6-8.4,13.5-9.4,13.5-9.4s-3,2.7-3.7,7c4.3-3.4,9-6.2,9-6.2s-1.8,2.3-3.5,5.8l0.4,0.6c5-3,10.9-5.4,10.9-5.4
+	s-1.7,2.1-3.7,4.9c3.8,0,11.5,0.2,14.4,0.5c17.6,0.4,21.2-18.8,28-21.2c8.4-3,12.2-4.9,26.6,9.3c12.3,12.2,22,33.9,17.2,38.8
+	c-4,4-11.9-1.6-20.7-12.6c-4.6-5.8-8.1-12.7-9.8-21.4c-1.4-7.4-6.8-11.6-6.8-11.6s3.1,7,3.1,13.2c0,3.4,0.4,16,5.8,23
+	c-0.5,1-0.8,5.1-1.4,5.9c-6.3-7.6-19.7-13-21.9-14.6c7.4,6.1,24.5,20.1,31.1,33.6c6.2,12.7,2.5,24.4,5.7,27.4
+	c0.9,0.9,13.3,16.4,15.7,24.2c4.2,13.6,0.2,27.9-5.2,36.8l-15.3,2.4c-2.2-0.6-3.7-0.9-5.7-2.1c1.1-2,3.3-6.8,3.3-7.9l-0.9-1.5
+	c-4.7,6.7-12.7,13.3-19.3,17.1c-8.7,4.9-18.6,4.2-25.1,2.1c-18.4-5.7-35.9-18.2-40.1-21.5c0,0-0.1,2.6,0.7,3.2
+	c4.6,5.3,15.3,14.8,25.6,21.4l-21.9,2.4l10.4,81c-4.6,0.7-5.3,1-10.3,1.7c-4.4-15.7-12.9-26-22.2-32c-8.2-5.3-19.5-6.5-30.3-4.3
+	l-0.7,0.8c7.5-0.8,16.4,0.3,25.5,6.1c8.9,5.7,16.1,20.3,18.8,29.1c3.4,11.3,5.7,23.3-3.4,36.1c-6.5,9.1-25.5,14.1-40.8,3.2
+	c4.1,6.6,9.6,12,17.1,13c11.1,1.5,21.6-0.4,28.8-7.9c6.2-6.4,9.4-19.7,8.6-33.7l9.8-1.4l3.5,25.2l161.6-19.5L386.7,196.8z
+	 M288.4,128.5c-0.5,1-1.2,1.7-0.1,5.1l0.1,0.2l0.2,0.4l0.4,1c1.9,3.9,4,7.6,7.5,9.5c0.9-0.2,1.9-0.3,2.8-0.3
+	c3.3-0.1,5.4,0.4,6.7,1.1c0.1-0.7,0.1-1.6,0.1-3.1c-0.3-5,1-13.5-8.6-17.9c-3.6-1.7-8.7-1.2-10.3,0.9c0.3,0,0.6,0.1,0.8,0.2
+	C290.6,126.6,288.8,127.5,288.4,128.5 M315.2,175c-1.3-0.7-7.1-0.4-11.2,0.1c-7.8,0.9-16.3,3.7-18.2,5.1c-3.4,2.6-1.8,7.2,0.7,9
+	c7,5.2,13.1,8.7,19.6,7.9c4-0.5,7.5-6.8,9.9-12.5C317.6,180.7,317.6,176.4,315.2,175 M245.8,134.7c2.2-2.1-11-4.9-21.3,2.1
+	c-7.6,5.2-7.8,16.3-0.6,22.6c0.7,0.6,1.3,1.1,1.9,1.4c2.1-1,4.5-2,7.3-2.9c4.7-1.5,8.6-2.3,11.8-2.7c1.5-1.7,3.3-4.7,2.9-10.2
+	C247.2,137.6,241.6,138.7,245.8,134.7"/>
+<path id="Text" fill-rule="evenodd" clip-rule="evenodd" fill="#774AA4" d="M69.9,435.7H43.7v-60.4h26.2c18.9,0,28.4,9.5,28.4,28.6
+	C98.3,425.1,88.9,435.7,69.9,435.7 M54.9,426h13.3c12.6,0,18.8-7.4,18.8-22.1c0-12.6-6.3-18.9-18.8-18.9H54.9V426z M110.1,435.7
+	H98.6l25.7-60.4h12.1l26.3,60.4h-12.1l-7.6-16.5h-19.4l3.9-9.7h12.6l-9.9-22.7L110.1,435.7z M156.2,375.3h45.9v9.7h-17.4v50.7h-11.2
+	V385h-17.4V375.3z M207.9,435.7h-11.5l25.7-60.4h12.1l26.3,60.4h-12.1l-7.6-16.5h-19.4l3.8-9.7h12.6l-9.9-22.7L207.9,435.7z
+	 M294.1,435.7h-26.2v-60.4h26.2c18.9,0,28.4,9.5,28.4,28.6C322.5,425.1,313.1,435.7,294.1,435.7 M279.1,426h13.3
+	c12.6,0,18.8-7.4,18.8-22.1c0-12.6-6.3-18.9-18.8-18.9h-13.3V426z M330.1,405.6c0-20.5,10.1-30.7,30.4-30.7
+	c20,0,29.9,10.2,29.9,30.7c0,20.4-10,30.6-29.9,30.6C341.2,436.1,331,426,330.1,405.6 M360.5,426.4c12.2,0,18.3-7,18.3-21.1
+	c0-13.8-6.1-20.8-18.3-20.8c-12.5,0-18.8,6.9-18.8,20.8C341.8,419.4,348,426.4,360.5,426.4 M437.3,411.3v14.1c-2.6,0.7-4.9,1-6.9,1
+	c-13.7,0-20.6-7.2-20.6-21.8c0-13.4,7.3-20.1,21.8-20.1c6.1,0,11.7,1.1,16.9,3.4v-10.1c-5.2-2-11.1-3-17.8-3
+	c-21.7,0-32.6,9.9-32.6,29.8c0,21,10.7,31.5,32.1,31.5c7.4,0,13.5-1.1,18.3-3.2v-31.6h-18.1l-3.8,9.9H437.3z"/>
+</svg>
\ No newline at end of file
diff --git a/templates/datadog/config.yml b/templates/datadog/config.yml
new file mode 100755
index 0000000..51d3baa
--- /dev/null
+++ b/templates/datadog/config.yml
@@ -0,0 +1,8 @@
+name: Datadog
+description: |
+  Datadog Agent and DogStatsD
+version: 11.0.563-rancher1
+category: Monitoring
+maintainer: "Jan Broer <jan@festplatte.eu.org>"
+license: The MIT License
+projectURL: http://www.github.com/janeczku/dd-agent-rancher