diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
index 81acb95..6cfac36 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
@@ -1,4 +1,5 @@
-{%- from "kubernetes/map.jinja" import common with context -%}
+{%- from "kubernetes/map.jinja" import master with context %}
+{%- from "kubernetes/map.jinja" import common with context %}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -29,5 +30,19 @@
           args:
             - "-v=5"
             - "-logtostderr"
-            - "-kubeproxyinit"
+            - "-kubeproxyinit=false"
             - "-endpoint=0.0.0.0:{{ common.addons.netchecker.port }}"
+            - "-etcd-endpoints={% for member in master.etcd.members %}https://{{ member.host }}:4001{% if not loop.last %},{% endif %}{% endfor %}"
+{%- if master.etcd.get('ssl', {}).get('enabled') %}
+            - "-etcd-key=/var/lib/etcd/etcd-client.key"
+            - "-etcd-cert=/var/lib/etcd/etcd-client.pem"
+            - "-etcd-ca=/var/lib/etcd/ca.pem"
+{%- endif %}
+          volumeMounts:
+          - mountPath: /var/lib/etcd/
+            name: etcd-certs
+            readOnly: true
+      volumes:
+      - hostPath:
+          path: /var/lib/etcd
+        name: etcd-certs
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index 02c41fe..bad9c19 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -31,8 +31,8 @@
           interval: 60
           namespace: netchecker
           port: 80
-          agent_image: mirantis/k8s-netchecker-agent:v1.1.0
-          server_image: mirantis/k8s-netchecker-server:v1.1.0
+          agent_image: mirantis/k8s-netchecker-agent:stable
+          server_image: mirantis/k8s-netchecker-server:stable
         calico_policy:
           enabled: False
           image: calico/kube-policy-controller:v0.5.4