diff --git a/ansible/roles/finish-kubespray/tasks/main.yml b/ansible/roles/finish-kubespray/tasks/main.yml
index 258c0ac..c48dbbc 100644
--- a/ansible/roles/finish-kubespray/tasks/main.yml
+++ b/ansible/roles/finish-kubespray/tasks/main.yml
@@ -23,7 +23,7 @@
 - name: Move kubespray admin.conf to ~/.kube/config
   copy:
     remote_src: true
-    src: "{{ kubespray_dir }}/artifacts/admin.conf"
+    src: "{{ kubespray_dir }}/inventory/cord/artifacts/admin.conf"
     dest: "~/.kube/config"
 
 - name: Find Vagrant head VM IP address
diff --git a/ansible/roles/prep-kubespray/defaults/main.yml b/ansible/roles/prep-kubespray/defaults/main.yml
index ba1c7a9..57e0818 100644
--- a/ansible/roles/prep-kubespray/defaults/main.yml
+++ b/ansible/roles/prep-kubespray/defaults/main.yml
@@ -15,7 +15,7 @@
 
 # prep-kubespray/defaults/main.yml
 
-kubespray_version: "master"
+kubespray_version: "v2.5.0"
 kubespray_dir: "{{ 'kubespray' | realpath }}"
 
 management_net_cidr: "10.1.0.0/24"
diff --git a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2 b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
index e803340..d0f1724 100644
--- a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
+++ b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
@@ -12,6 +12,9 @@
 {{ node }} ip='{{ management_net_cidr | ipaddr(npi.ipv4_last_octet) |  ipaddr("address")  }}'
 {% endfor %}
 
+[cord-headnodes:vars]
+supplementary_addresses_in_ssl_keys=['{{ hostvars[groups["head"][0]].ansible_default_ipv4.address }}']
+
 [kube-master:children]
 cord-headnodes
 cord-computenodes
diff --git a/scenarios/controlkube/config.yml b/scenarios/controlkube/config.yml
index 7a243f3..985eb4a 100644
--- a/scenarios/controlkube/config.yml
+++ b/scenarios/controlkube/config.yml
@@ -71,10 +71,6 @@
 docker_images_prereqs:
   - prep-headnode
 
-# FIXME: check out and use this kubespray commit (set on 2018-03-02 by zdw):
-# https://github.com/kubernetes-incubator/kubespray/commit/b75b6b513b7d26a0fce3dd55a77ef538d18433a5
-kubespray_version: b75b6b513b7d26a0fce3dd55a77ef538d18433a5
-
 # have kubespray skip docker installation
 skipTags:
   - docker
diff --git a/scenarios/preppedkube/config.yml b/scenarios/preppedkube/config.yml
index aa282b7..ad39621 100644
--- a/scenarios/preppedkube/config.yml
+++ b/scenarios/preppedkube/config.yml
@@ -74,10 +74,6 @@
 docker_images_prereqs:
   - prep-headnode
 
-# FIXME: check out and use this kubespray commit (set on 2018-03-02 by zdw):
-# https://github.com/kubernetes-incubator/kubespray/commit/b75b6b513b7d26a0fce3dd55a77ef538d18433a5
-kubespray_version: b75b6b513b7d26a0fce3dd55a77ef538d18433a5
-
 # have kubespray skip docker installation
 skipTags:
   - docker