diff --git a/docker/scripts/take-ownership.sh b/docker/scripts/take-ownership.sh
index 322a932..11106a0 100755
--- a/docker/scripts/take-ownership.sh
+++ b/docker/scripts/take-ownership.sh
@@ -3,7 +3,7 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 # Export desktop environment shell configuration
 export $($REPO_ROOT/docker/scripts/environment.sh)
 
-DESKTOP_ENVIRONMENT_VOLUMES=$(cat $REPO_ROOT/docker/scripts/environment.sh | grep echo | grep -E "CACHE|STATE|USER_" | cut -b 6- | cut -f 1 -d =)
+DESKTOP_ENVIRONMENT_VOLUMES=$(cat $REPO_ROOT/docker/scripts/environment.sh | grep echo | grep -v _ID | grep -E "CACHE|STATE|USER_" | cut -b 6- | cut -f 1 -d =)
 
 for VOLUME_NAME in $DESKTOP_ENVIRONMENT_VOLUMES; do
 
diff --git a/packer/scripts/build.sh b/packer/scripts/build.sh
index 0877b4c..21c21ad 100755
--- a/packer/scripts/build.sh
+++ b/packer/scripts/build.sh
@@ -3,12 +3,12 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 # Export desktop environment shell configuration
 export $($REPO_ROOT/docker/scripts/environment.sh)
 
-# Authenticate with cloud service provider
-$REPO_ROOT/credentials/authenticate.sh
-
 # Clone the desktop environment into a local docker volume
 $REPO_ROOT/docker/scripts/clone.sh
 
+# Authenticate with cloud service provider
+$REPO_ROOT/credentials/authenticate.sh
+
 docker run \
   --env GOOGLE_APPLICATION_CREDENTIALS=$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/credentials/credentials.json \
   --interactive \