diff --git a/Makefile b/Makefile
index 4eb192d..804fa9e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ citadel-image: ## Build citadel-image with bitbake
 citadel-kernel: ## Build citadel-kernel with bitbake
 	$(DOCKER_RUN) bash -c "source setup-build-env && bitbake citadel-kernel"
 
+bootloader: ## Build systemd-boot
+	$(DOCKER_RUN) bash -c "source setup-build-env && bitbake systemd-boot"
+
 user-rootfs: ## Build user-rootfs tarball with debootstrap and configuration scripts
 	mkdir -p build/debootstrap
 	$(DOCKER_RUN_PRIV) sudo scripts/build-user-rootfs-stage-one | tee build/debootstrap/build-user-rootfs.log
diff --git a/scripts/build-user-rootfs-stage-one b/scripts/build-user-rootfs-stage-one
index 7e088ba..3e18baf 100755
--- a/scripts/build-user-rootfs-stage-one
+++ b/scripts/build-user-rootfs-stage-one
@@ -43,8 +43,8 @@ cleanup_chroot() {
 
 generate_tarball() {
     printf "\n\n----- Generating rootfs tarball -----\n\n"
-    tar -C ${DBS_ROOT} -c --xattrs --xattrs-include=* -f ${DBS_BASE}/user-rootfs.tar .
-    #xz --force --threads=0 ${DBS_BASE}/user-rootfs.tar
+    tar -C ${DBS_ROOT} --numeric-owner -c --xattrs --xattrs-include=* -f ${DBS_BASE}/user-rootfs.tar .
+    xz --force --threads=0 ${DBS_BASE}/user-rootfs.tar
     ls -al ${DBS_BASE}/user-rootfs.tar
     printf "\n\n"
 }
diff --git a/setup-build-env b/setup-build-env
index c3a1e6f..d4bee60 100644
--- a/setup-build-env
+++ b/setup-build-env
@@ -13,6 +13,6 @@ if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
     exit 1
 fi
 
-TEMPLATECONF=../meta-citadel-distro/conf
+TEMPLATECONF=../meta-citadel/conf
 . poky/oe-init-build-env