diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml b/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
index 755bf11..855884a 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
@@ -20,6 +20,10 @@
         - name: netchecker-agent
           image: {{ master.addons.netchecker.agent_image }}
           env:
+            - name: MY_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             - name: MY_POD_NAME
               valueFrom:
                 fieldRef:
@@ -29,3 +33,6 @@
             - "-alsologtostderr=true"
             - "-serverendpoint=netchecker:{{ master.addons.netchecker.port }}"
             - "-reportinterval={{ master.addons.netchecker.interval }}"
+{%- if master.addons.netchecker.get('agent_probeurls') %}
+            - "-probeurls={{ master.addons.netchecker.agent_probeurls }}"
+{%- endif %}
diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
index fdd52ab..8d37948 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
@@ -10,6 +10,9 @@
     metadata:
       labels:
         app: netchecker-server
+      annotations:
+        prometheus.io/scrape: true
+        prometheus.io/port: {{ master.addons.netchecker.port }}
     spec:
       tolerations:
         - key: node-role.kubernetes.io/master
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index eee68bf..d3d8c15 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -58,8 +58,8 @@
           interval: 60
           namespace: netchecker
           port: 80
-          agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
-          server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+          agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+          server_image: mirantis/k8s-netchecker-server:v1.1.0
         calico_policy:
           enabled: False
           image: calico/kube-policy-controller:v0.5.4
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 9c5dca0..d4b1f64 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -29,6 +29,7 @@
         interval: 60
         server_image: image
         agent_image: image
+        agent_probeurls: "http://ipinfo.io"
       calico_policy:
         enabled: true
         namespace: kube-system
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index b1d5037..a79774c 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -29,6 +29,7 @@
         interval: 60
         server_image: image
         agent_image: image
+        agent_probeurls: "http://ipinfo.io"
       calico_policy:
         enabled: true
         namespace: kube-system
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index f900fe5..95e39aa 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -30,6 +30,7 @@
         interval: 60
         server_image: image
         agent_image: image
+        agent_probeurls: "http://ipinfo.io"
     admin:
       password: password
       username: admin
@@ -65,7 +66,7 @@
         - host: 127.0.0.1
         - host: 127.0.0.1
         - host: 127.0.0.1
-      collector:  
+      collector:
         members:
         - host: 127.0.0.1
         - host: 127.0.0.1