diff --git a/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 b/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2
index 71578fa0b..e4ddfec86 100644
--- a/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2
+++ b/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2
@@ -8,7 +8,7 @@ etcdctl \
   --cert {{ kube_cert_dir }}/etcd/server.crt \
   --key {{ kube_cert_dir }}/etcd/server.key "$@"
 {% else %}
-  --cacert {{ etcd_cert_dir }}/etcd/ca.crt \
-  --cert {{ etcd_cert_dir }}/etcd/server.crt \
-  --key {{ etcd_cert_dir }}/etcd/server.key "$@"
-  {% endif %}
\ No newline at end of file
+  --cacert {{ etcd_cert_dir }}/ca.pem \
+  --cert {{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem \
+  --key {{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem "$@"
+{% endif %}