diff --git a/envsetup.sh b/envsetup.sh
index 8c0651428..2818a193f 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -158,6 +158,8 @@ PROXYHOST=""
 YOE_ENV_VERSION=13
 YOE_ENV_FILE=localconfig.sh
 
+[ -n "`git config user.email`" ] && GIT_USER_EMAIL="$(git config user.email)" || GIT_USER_EMAIL="yoe@yoedistro"
+[ -n "`git config user.name`" ] && GIT_USER_NAME="$(git config user.name)" || GIT_USER_NAME="Yoe User"
 # Workaround for differences between yocto bitbake and vanilla bitbake
 export BBFETCH2=True
 
@@ -299,6 +301,9 @@ TMPDIR = "${OE_BUILD_TMPDIR}"
 #HTTP_PROXY        = "http://${PROXYHOST}:${PROXYPORT}/"
 
 MACHINE ?= "$MACHINE"
+
+PATCH_GIT_USER_NAME = "${GIT_USER_NAME}"
+PATCH_GIT_USER_EMAIL = "${GIT_USER_EMAIL}"
 _EOF
 
 echo "${AUTO_CONF} has been updated"
diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc
index 378aed666..a34f83908 100644
--- a/sources/meta-yoe/conf/distro/yoe.inc
+++ b/sources/meta-yoe/conf/distro/yoe.inc
@@ -121,6 +121,8 @@ DISTRO_FEATURES:remove:riscv32 = "ld-is-lld"
 # See https://discourse.llvm.org/t/lld-cannot-make-pie-binaries-on-x32/67131
 DISTRO_FEATURES:remove:linux-gnux32 = "ld-is-lld"
 DISTRO_FEATURES:remove:linux-muslx32 = "ld-is-lld"
+# mips-yoe-linux-ld.lld: error: the .gnu.hash section is not compatible with the MIPS target
+DISTRO_FEATURES:remove:mipsarcho32 = "ld-is-lld"
 
 #PREFERRED_PROVIDER_pkgconfig = "pkgconf"
 #PREFERRED_PROVIDER_pkgconfig-native = "pkgconf-native"
diff --git a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
index 9dae9f650..209a28f11 100644
--- a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
+++ b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
@@ -24,6 +24,8 @@ IMAGE_INSTALL = "\
 "
 
 IMAGE_INSTALL:append:libc-musl = " gcompat"
+# Add pregenerated ssh keys for improving first time bootup speed
+IMAGE_INSTALL:append:qemuall = " ssh-pregen-hostkeys"
 
 export IMAGE_BASENAME = "yoe-simple-image"