diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh
index a9c4a178ca..bcd52fd9f4 100755
--- a/ci/tasks/build.sh
+++ b/ci/tasks/build.sh
@@ -77,11 +77,9 @@ chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
 chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
 
-sudo --set-home --user ubuntu -- \
-  env GEM_HOME="${GEM_HOME}" \
-      UBUNTU_ADVANTAGE_TOKEN="${UBUNTU_ADVANTAGE_TOKEN:-}" \
-      UBUNTU_FIPS_USE_IAAS_KERNEL="${UBUNTU_FIPS_USE_IAAS_KERNEL:-}" \
-  /bin/bash --login -i <<SUDO
+sudo --set-home --user ubuntu \
+  --preserve-env=GEM_HOME,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_FIPS_USE_IAAS_KERNEL \
+  -- /bin/bash --login -i <<SUDO
 set -e
 
 cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
diff --git a/ci/tasks/os-images/build.sh b/ci/tasks/os-images/build.sh
index 62bb14b479..f8f31b58a7 100755
--- a/ci/tasks/os-images/build.sh
+++ b/ci/tasks/os-images/build.sh
@@ -35,12 +35,9 @@ chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
 chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
 
-sudo --set-home --user ubuntu -- \
-  env GEM_HOME="${GEM_HOME}" \
-      BUILD_TIME="${BUILD_TIME:-}" \
-      UBUNTU_ADVANTAGE_TOKEN="${UBUNTU_ADVANTAGE_TOKEN:-}" \
-      UBUNTU_DEBOOTSTRAP_MIRROR="${UBUNTU_DEBOOTSTRAP_MIRROR:-}" \
-  /bin/bash --login -i <<SUDO
+sudo --set-home --user ubuntu \
+  --preserve-env=GEM_HOME,BUILD_TIME,UBUNTU_ADVANTAGE_TOKEN,UBUNTU_DEBOOTSTRAP_MIRROR \
+  -- /bin/bash --login -i <<SUDO
 set -e
 
 cd "${REPO_PARENT}/bosh-linux-stemcell-builder"