diff --git a/datadog/config.sls b/datadog/config.sls
index 6968c37..03f6d5d 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 {% from "datadog/map.jinja" import datadog with context %}
 
 datadog-example:
@@ -10,18 +8,50 @@ datadog-example:
     - require:
       - pkg: datadog-pkg
 
-{% if datadog.api_key is defined %}
-datadog-conf:
+datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: "api_key:(.*)"
+{% if datadog.api_key is defined %}
     - repl: "api_key: {{ datadog.api_key }}"
+{% else %}
+    - repl: "# api_key: "
+{% endif %}
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    - require:
-      - cmd: datadog-example
+
+datadog-hostname-conf:
+  file.replace:
+    - name: {{ datadog.config }}
+    - pattern: |
+        (\#\s)?hostname\:(.*)
+{% if datadog.hostname is defined %}
+    - repl: |
+        hostname: {{ datadog.hostname }}
+{% else %}
+    - repl: |
+        "# hostname: none"
+{% endif %}
+    - count: 1
+    - watch:
+      - pkg: datadog-pkg
+
+datadog-tags-conf:
+  file.replace:
+    - name: {{ datadog.config }}
+    - pattern: |
+        (\#\s)?tags\:(.*)
+{% if datadog.tags %}
+    - repl: |
+        tags: {{ datadog.tags|join(", ") }}
+{% else %}
+    - repl: |
+        "# tags: none"
 {% endif %}
+    - count: 1
+    - watch:
+      - pkg: datadog-pkg
 
 {% if datadog.checks is defined %}
 {% for check_name in datadog.checks %}
diff --git a/datadog/defaults.yaml b/datadog/defaults.yaml
index 630c4e3..f9a934f 100644
--- a/datadog/defaults.yaml
+++ b/datadog/defaults.yaml
@@ -6,4 +6,7 @@ datadog:
   checks_config: '/etc/dd-agent/conf.d'
   service:
     name: datadog-agent
+  docker:
+    image: datadog/agent
+    tag: latest
   api_key: aaaaaaaabbbbbbbbccccccccdddddddd
diff --git a/datadog/install.sls b/datadog/install.sls
index 4c935cd..896e538 100644
--- a/datadog/install.sls
+++ b/datadog/install.sls
@@ -32,3 +32,13 @@ datadog-pkg:
     - refresh: True
     - require:
       - pkgrepo: datadog-repo
+
+#
+# DD docker-agent
+#
+#docker run -d --name dd-agent -v /var/run/docker.sock:/var/run/docker.sock:ro -v /proc/:/host/proc/:ro -v /sys/fs/cgroup/:/host/sys/fs/cgroup:ro -e DD_API_KEY=2494bbd7f3f567e4142cb25ef9d9f389 datadog/agent:latest
+# docker-agent-present:
+#   docker_image.present:
+#     - image: {{ config.docker.image }}
+#     - tag: {{ config.docker.tag }}
+#     - force: true  # ensure its always pulled
\ No newline at end of file
diff --git a/pillar.example b/pillar.example
index 1bfb7bc..415a579 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,5 +1,9 @@
 datadog:
   api_key: aaaaaaaabbbbbbbbccccccccdddddddd
+  hostname: {{ grains.id }}  # or done include to have it automatically be calculated
+  tags:
+    - env:staging
+    - team:sunny
   checks:
     process:
       init_config: