diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml
index 1b5a738f253538f91efad4b19bf7d5ae516d136f..68fb96f3422c5c8ff219caba5c6db231e4c09e5d 100644
--- a/prometheus/Chart.yaml
+++ b/prometheus/Chart.yaml
@@ -16,4 +16,4 @@ sources:
 - https://github.com/prometheus/node_exporter
 - https://github.com/kubernetes/kube-state-metrics
 tillerVersion: '>=2.8.0'
-version: 8.6.2
+version: 8.7.0
diff --git a/prometheus/scrape_configs/dev/messaging-service_sc.yaml b/prometheus/scrape_configs/dev/messaging-service_sc.yaml
index 546c72e642f8399b2803d7217ce0007c2fb40702..eb0162dc9ade4f7a9641a05b99cc768b8be26c63 100644
--- a/prometheus/scrape_configs/dev/messaging-service_sc.yaml
+++ b/prometheus/scrape_configs/dev/messaging-service_sc.yaml
@@ -5,7 +5,10 @@
   scheme: http
   static_configs:
   - targets:
-    - "dev.ci.nynja.net:8888"
+    # Erlang data
+    - "nynja-dev-uw1-messaging01.dev.nynja.pvt:8888"
+    # Node exporter
+    - "nynja-dev-uw1-messaging01.dev.nynja.pvt:9100"
     labels:
        env: dev
 
diff --git a/prometheus/scrape_configs/prd/messaging-service_sc.yaml b/prometheus/scrape_configs/prd/messaging-service_sc.yaml
index f6bd7aa44beceae3f5d4979796e1456cbd319505..175b81b528aaf1075c40beb2ff32438b1ff7d48a 100644
--- a/prometheus/scrape_configs/prd/messaging-service_sc.yaml
+++ b/prometheus/scrape_configs/prd/messaging-service_sc.yaml
@@ -6,8 +6,8 @@
   static_configs:
   - targets:
     # erlang server custom metrics
-    - "10.152.0.8:8888"
+    - "nynja-prod-uw1-messaging01.prod.nynja.pvt:8888"
     # node exporter
-    - "10.152.0.8:9100"
+    - "nynja-prod-uw1-messaging01.prod.nynja.pvt:9100"
     labels:
        env: prd
diff --git a/prometheus/scrape_configs/stg/messaging-service_sc.yaml b/prometheus/scrape_configs/stg/messaging-service_sc.yaml
index e1ff470c60d220fce036453a04371a506d54c912..089f7cb9614041e37f0bc973e7c71cb101cc250a 100644
--- a/prometheus/scrape_configs/stg/messaging-service_sc.yaml
+++ b/prometheus/scrape_configs/stg/messaging-service_sc.yaml
@@ -6,8 +6,8 @@
   static_configs:
   - targets:
     # Erlang data
-    - "35.198.110.223:8888"
+    - "nynja-staging-uw1-messaging01.staging.nynja.pvt:8888"
     # Node exporter
-    - "35.198.110.223:9100"
+    - "nynja-staging-uw1-messaging01.staging.nynja.pvt:9100"
     labels:
        env: stg