diff --git a/README.md b/README.md
index 5ccb0d5b08..02479764d9 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ container, you should be able to run the specific tests:
 
 ```shell
 cd /opt/bosh/bosh-stemcell; \
-bundle install \
+bundle install; \
 STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.raw \
 STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
 OS_NAME=ubuntu \
@@ -174,8 +174,8 @@ an ubuntu chroot environment to run. For this reason, we use the
 locally, run:
 
 ```shell
-bundle install --local
 cd /opt/bosh/bosh-stemcell
+bundle install
 OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rake spec:shellout_types
 ```
 
diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh
index 4d9ccc7b9f..22fca0e4e2 100755
--- a/ci/tasks/build.sh
+++ b/ci/tasks/build.sh
@@ -82,12 +82,13 @@ fi
 
 sudo chmod u+s "$(which sudo)"
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
-  set -e
+set -e
 
-  cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
-bundle update --bundler
-bundle install --local
+pushd "${REPO_ROOT}/bosh-stemcell"
+  bundle install
+popd
 
+cd "${REPO_ROOT}"
 if [[ -z "$OS_IMAGE" ]]; then
 	bundle exec rake stemcell:build[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$CANDIDATE_BUILD_NUMBER]
 	rm -f ./tmp/base_os_image.tgz
diff --git a/ci/tasks/os-images/build.sh b/ci/tasks/os-images/build.sh
index 3943f88c6f..6b0cf609f8 100755
--- a/ci/tasks/os-images/build.sh
+++ b/ci/tasks/os-images/build.sh
@@ -33,7 +33,7 @@ fi
 sudo chown -R ubuntu .
 sudo chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
-bundle install --local
+bundle install
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
 bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
 SUDO
diff --git a/scripts/build.sh b/scripts/build.sh
index ef7bdb77d3..4551570dfb 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,7 +16,7 @@ function build() {
       exit 1
     fi
 
-    bundle install --local
+    bundle install
 
     # TODO(cdutra): build os image
   popd