diff --git a/bin/setup-openstack-rc.sh b/bin/setup-openstack-rc.sh
index 68d66782c..4f8065443 100755
--- a/bin/setup-openstack-rc.sh
+++ b/bin/setup-openstack-rc.sh
@@ -12,7 +12,7 @@ if ! yq --version 2> /dev/null; then
   installYq
 fi
 
-USER_NAME="$(who am i | awk '{print $1}')"
+USER_NAME="$(whoami)"
 USER_PATH="$(getent passwd ${USER_NAME} | awk -F':' '{print $6}')"
 CONFIG_PATH="${USER_PATH}/.config/openstack"
 CONFIG_FILE="${CONFIG_PATH}/genestack-clouds.yaml"
diff --git a/scripts/hyperconverged-lab.sh b/scripts/hyperconverged-lab.sh
index 01d48d006..ba26b8660 100755
--- a/scripts/hyperconverged-lab.sh
+++ b/scripts/hyperconverged-lab.sh
@@ -662,7 +662,7 @@ EOC
 # Run Genestack post setup
 ssh -o ForwardAgent=yes -o UserKnownHostsFile=/dev/null -t ${SSH_USERNAME}@${JUMP_HOST_VIP} <<EOC
 set -e
-sudo /opt/genestack/bin/setup-openstack-rc.sh
+sudo bash <<HERE
 sudo /opt/genestack/bin/setup-openstack-rc.sh
 source /opt/genestack/scripts/genestack.rc
 if ! openstack --os-cloud default flavor show hyperconverged-test; then
@@ -691,6 +691,7 @@ if ! openstack --os-cloud default subnet show flat_subnet; then
             --network flat \
             flat_subnet
 fi
+HERE
 EOC
 
 echo "The lab is now ready for use and took ${SECONDS} seconds to complete."