diff --git a/.gitignore b/.gitignore
index 2ac32d7..14de775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 credentials.json
 logs/
-terraform.tfstate
diff --git a/host/bootstrap.sh b/host/bootstrap.sh
index 6ac7522..cabf18c 100755
--- a/host/bootstrap.sh
+++ b/host/bootstrap.sh
@@ -96,10 +96,13 @@ docker pull --quiet jare/x11-bridge:latest
 # Clone the desktop environment into a local docker volume
 $REPO_ROOT/docker/scripts/clone.sh
 
-# Start the environment on host startup
+# Create a boot entry for the desktop environment
 DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH=/var/lib/docker/volumes/$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/_data$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY
 if [ "$1" = "--xpra" ]; then
-  echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/recycle-xpra.sh; exit 0" > /etc/rc2.d/S01$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
+  echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/recycle-xpra.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
 else
-  echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/recycle.sh; exit 0" > /etc/rc2.d/S01$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
+  echo "$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY_VOLUME_PATH/docker/scripts/recycle.sh; exit 0" > /etc/init.d/$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
 fi
+
+# Start the environment on host startup
+ln -s /etc/init.d/$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME /etc/rc2.d/S02$DESKTOP_ENVIRONMENT_REPOSITORY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME