diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh
index d200c5c89..59d03717d 100755
--- a/.expeditor/buildkite/artifact.habitat.test.sh
+++ b/.expeditor/buildkite/artifact.habitat.test.sh
@@ -6,6 +6,7 @@ export HAB_ORIGIN='ci'
 export PLAN='inspec'
 export CHEF_LICENSE="accept-no-persist"
 export HAB_LICENSE="accept-no-persist"
+export CI_USER=$(whoami)
 
 echo "--- system details"
 uname -a
@@ -26,10 +27,7 @@ fi
 
 echo "--- Installing ${pkg_ident:?is undefined}"
 
-id -a
-ls -laR ~/.hab/cache/keys
-
-sudo -E "hab origin key import < ~buildkite/.hab/cache/keys/$HAB_ORIGIN*.pub"
+sudo -E "hab origin key import < ~$CI_USER/.hab/cache/keys/$HAB_ORIGIN*.pub"
 sudo -E hab pkg install "./results/${pkg_artifact:?is undefined}"
 
 echo "+++ Testing $PLAN"