diff --git a/networks/remote/ansible/install-datadog-agent.yml b/networks/remote/ansible/install-datadog-agent.yml
index d32458703..54b77e1f8 100644
--- a/networks/remote/ansible/install-datadog-agent.yml
+++ b/networks/remote/ansible/install-datadog-agent.yml
@@ -7,4 +7,5 @@
   gather_facts: no
   roles:
     - install-datadog-agent
+    - update-datadog-agent
 
diff --git a/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml b/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml
index bba86a5ac..0c0a49eca 100644
--- a/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml
+++ b/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml
@@ -13,14 +13,6 @@
     DD_API_KEY: "{{DD_API_KEY}}"
     DD_HOST_TAGS: "testnet:{{TESTNET_NAME}},cluster:{{CLUSTER_NAME}}"
 
-- name: Set datadog.yaml config
-  template: src=datadog.yaml.j2 dest=/etc/datadog-agent/datadog.yaml
-  notify: restart datadog-agent
-
-- name: Set metrics config
-  copy: src=conf.d/ dest=/etc/datadog-agent/conf.d/
-  notify: restart datadog-agent
-
 - name: Disable journald rate-limiting
   lineinfile: "dest=/etc/systemd/journald.conf regexp={{item.regexp}} line='{{item.line}}'"
   with_items:
diff --git a/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/http_check.d/conf.yaml b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/http_check.d/conf.yaml
new file mode 100644
index 000000000..6932ed6f4
--- /dev/null
+++ b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/http_check.d/conf.yaml
@@ -0,0 +1,13 @@
+init_config:
+
+instances:
+  - name: gaiad
+    url: http://localhost:26657/status
+    timeout: 1
+    content_match: '"latest_block_height": "0",'
+    reverse_content_match: true
+
+  - name: gaiacli
+    url: http://localhost:1317/node_version
+    timeout: 1
+
diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/network.d/conf.yaml b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/network.d/conf.yaml
similarity index 100%
rename from networks/remote/ansible/roles/install-datadog-agent/files/conf.d/network.d/conf.yaml
rename to networks/remote/ansible/roles/update-datadog-agent/files/conf.d/network.d/conf.yaml
diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/process.d/conf.yaml b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/process.d/conf.yaml
similarity index 100%
rename from networks/remote/ansible/roles/install-datadog-agent/files/conf.d/process.d/conf.yaml
rename to networks/remote/ansible/roles/update-datadog-agent/files/conf.d/process.d/conf.yaml
diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/prometheus.d/conf.yaml
similarity index 51%
rename from networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml
rename to networks/remote/ansible/roles/update-datadog-agent/files/conf.d/prometheus.d/conf.yaml
index b08908400..20c04ceee 100644
--- a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml
+++ b/networks/remote/ansible/roles/update-datadog-agent/files/conf.d/prometheus.d/conf.yaml
@@ -2,6 +2,9 @@ init_config:
 
 instances:
   - prometheus_url: http://127.0.0.1:26660
-    namespace: "gaiad"
     metrics:
-      - p2p: *
+      - go*
+      - mempool*
+      - p2p*
+      - process*
+      - promhttp*
diff --git a/networks/remote/ansible/roles/update-datadog-agent/handlers/main.yml b/networks/remote/ansible/roles/update-datadog-agent/handlers/main.yml
new file mode 100644
index 000000000..90e05c17d
--- /dev/null
+++ b/networks/remote/ansible/roles/update-datadog-agent/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+
+- name: restart datadog-agent
+  service: name=datadog-agent state=restarted
+
diff --git a/networks/remote/ansible/roles/update-datadog-agent/tasks/main.yml b/networks/remote/ansible/roles/update-datadog-agent/tasks/main.yml
new file mode 100644
index 000000000..c6174c6af
--- /dev/null
+++ b/networks/remote/ansible/roles/update-datadog-agent/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+
+- name: Set datadog.yaml config
+  template: src=datadog.yaml.j2 dest=/etc/datadog-agent/datadog.yaml
+  notify: restart datadog-agent
+
+- name: Set metrics config
+  copy: src=conf.d/ dest=/etc/datadog-agent/conf.d/
+  notify: restart datadog-agent
+
diff --git a/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.yaml.j2 b/networks/remote/ansible/roles/update-datadog-agent/templates/datadog.yaml.j2
similarity index 100%
rename from networks/remote/ansible/roles/install-datadog-agent/templates/datadog.yaml.j2
rename to networks/remote/ansible/roles/update-datadog-agent/templates/datadog.yaml.j2
diff --git a/networks/remote/ansible/update-datadog-agent.yml b/networks/remote/ansible/update-datadog-agent.yml
new file mode 100644
index 000000000..3fe1e0006
--- /dev/null
+++ b/networks/remote/ansible/update-datadog-agent.yml
@@ -0,0 +1,10 @@
+---
+
+#DD_API_KEY,TESTNET_NAME,CLUSTER_NAME required
+
+- hosts: all
+  any_errors_fatal: true
+  gather_facts: no
+  roles:
+    - update-datadog-agent
+