diff --git a/roles/etcd/tasks/gen_certs.yml b/roles/etcd/tasks/gen_certs.yml
index 835e234b0..a4fd3a9d7 100644
--- a/roles/etcd/tasks/gen_certs.yml
+++ b/roles/etcd/tasks/gen_certs.yml
@@ -7,7 +7,7 @@
     owner=root
     recurse=yes
 
-- name: Gen_certs | create etcd script dir
+- name: "Gen_certs | create etcd script dir (on {{groups['etcd'][0]}})"
   file:
     path: "{{ etcd_script_dir }}"
     state: directory
@@ -15,7 +15,7 @@
   run_once: yes
   delegate_to: "{{groups['etcd'][0]}}"
 
-- name: Gen_certs | create etcd cert dir (on first etcd)
+- name: "Gen_certs | create etcd cert dir (on {{groups['etcd'][0]}})"
   file:
     path={{ etcd_cert_dir }}
     group={{ etcd_cert_group }}
diff --git a/roles/kubernetes/secrets/tasks/gen_certs.yml b/roles/kubernetes/secrets/tasks/gen_certs.yml
index a343a9337..cf4614d74 100644
--- a/roles/kubernetes/secrets/tasks/gen_certs.yml
+++ b/roles/kubernetes/secrets/tasks/gen_certs.yml
@@ -1,5 +1,5 @@
 ---
-- name: Gen_certs | Create kubernetes config directory (on master[0])
+- name: "Gen_certs | Create kubernetes config directory (on {{groups['kube-master'][0]}})"
   file:
     path: "{{ kube_config_dir }}"
     state: directory
@@ -9,7 +9,7 @@
   tags: [kubelet, k8s-secrets, kube-controller-manager, kube-apiserver, bootstrap-os, apps, network, master, node]
   when: gen_certs|default(false)
 
-- name: Gen_certs | Create kubernetes script directory (on master[0])
+- name: "Gen_certs | Create kubernetes script directory (on {{groups['kube-master'][0]}})"
   file:
     path: "{{ kube_script_dir }}"
     state: directory
diff --git a/roles/kubernetes/secrets/tasks/main.yml b/roles/kubernetes/secrets/tasks/main.yml
index 9969d5292..4d25a94af 100644
--- a/roles/kubernetes/secrets/tasks/main.yml
+++ b/roles/kubernetes/secrets/tasks/main.yml
@@ -40,7 +40,7 @@
 # exist on the first master for cases where the first master isn't
 # being run.
 #
-- name: Gen_certs | Create kubernetes config directory (on master[0])
+- name: "Gen_certs | Create kubernetes config directory (on {{groups['kube-master'][0]}})"
   file:
     path: "{{ kube_config_dir }}"
     state: directory
@@ -50,7 +50,7 @@
   tags: [kubelet, k8s-secrets, kube-controller-manager, kube-apiserver, bootstrap-os, apps, network, master, node]
   when: gen_certs|default(false) or gen_tokens|default(false)
 
-- name: Gen_certs | Create kubernetes script directory (on master[0])
+- name: "Gen_certs | Create kubernetes script directory (on {{groups['kube-master'][0]}})"
   file:
     path: "{{ kube_script_dir }}"
     state: directory
@@ -60,7 +60,7 @@
   tags: [k8s-secrets, bootstrap-os]
   when: gen_certs|default(false) or gen_tokens|default(false)
 
-- name: Get_tokens | Make sure the tokens directory exits (on master[0])
+- name: "Get_tokens | Make sure the tokens directory exits (on {{groups['kube-master'][0]}})"
   file:
     path={{ kube_token_dir }}
     state=directory