diff --git a/automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2 b/automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2
index f623fac5..f2fc70c1 100644
--- a/automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2
+++ b/automation/roles/bubble/templates/refresh_bubble_ssh_keys.sh.j2
@@ -38,7 +38,7 @@ done
 # Retain self-generated ansible setup key
 ANSIBLE_USER="{{node.user}}"
 if [[ ! -z "${ANSIBLE_USER}" ]] ; then
-  PUB_FILE="$(cd ~${ANSIBLE_USER} && pwd)/.ssh/bubble_rsa.pub"
+  PUB_FILE="$(cd ~{{node.user}} && pwd)/.ssh/bubble_rsa.pub"
   if [[ -f "${PUB_FILE}" ]] ; then
     cat "${PUB_FILE}" >> ${NEW_KEYS}
   fi
diff --git a/bubble-server/src/main/resources/ansible/install_local.sh.hbs b/bubble-server/src/main/resources/ansible/install_local.sh.hbs
index bc8234d7..d35f7613 100644
--- a/bubble-server/src/main/resources/ansible/install_local.sh.hbs
+++ b/bubble-server/src/main/resources/ansible/install_local.sh.hbs
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ANSIBLE_USER="{{node.user}}"
-ANSIBLE_HOME="$(cd ~${ANSIBLE_USER} && pwd)"
+ANSIBLE_HOME="$(cd ~{{node.user}} && pwd)"
 LOG="${ANSIBLE_HOME}/.ansible.log"
 
 function log {
diff --git a/bubble-web b/bubble-web
index 66140fa3..1ad306cd 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 66140fa3ec92ef8b6418eb925d003b5730b113d2
+Subproject commit 1ad306cdb3dbc9e56bf9068d438b5e0ca0ed1c37