diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml
index a41f4f65..eb6db9da 100644
--- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml
+++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml
@@ -1,5 +1,5 @@
 ---
-name: debian-image-demo
+name: starlingx
 machine: intel-x86-64
 image_type:
 - iso
@@ -106,8 +106,8 @@ environments:
 - NO_RECOMMENDATIONS="1"
 - DEBIAN_FRONTEND=noninteractive
 ostree:
-  ostree_use_ab: '1'
-  ostree_osname: wrlinux
+  ostree_use_ab: '0'
+  ostree_osname: debian
   ostree_skip_boot_diff: '2'
   ostree_remote_url: ''
   ostree_extra_install_args: 'inststx=1'
diff --git a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml
index 8e0220cf..ed20d563 100644
--- a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml
+++ b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml
@@ -1,5 +1,5 @@
 ---
-name: debian-initramfs-ostree-image
+name: starlingx-initramfs
 machine: intel-x86-64
 image_type:
 - initramfs
diff --git a/stx.conf.sample b/stx.conf.sample
index e1978d0f..6c48cdee 100644
--- a/stx.conf.sample
+++ b/stx.conf.sample
@@ -7,7 +7,7 @@ proxyserver = opendev.org
 proxyport = 8080
 buildbranch = master
 manifest = default.xml
-ostree_osname = wrlinux
+ostree_osname = debian
 
 [builder]
 uid = 1000
diff --git a/stx/dockerfiles/stx-lat-tool.Dockerfile b/stx/dockerfiles/stx-lat-tool.Dockerfile
index 739c9bfe..032ba844 100644
--- a/stx/dockerfiles/stx-lat-tool.Dockerfile
+++ b/stx/dockerfiles/stx-lat-tool.Dockerfile
@@ -42,5 +42,8 @@ RUN /opt/LAT/AppSDK.sh -d /opt/LAT/SDK -y
 # Fix: Use Debian CDN address for geo-frendly servers
 RUN sed -i 's/ftp.cn.debian.org/deb.debian.org/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py
 
+# Fix: Align DEFAULT_INITRD_NAME with our custom names
+RUN sed -i 's/debian-initramfs-ostree-image/starlingx-initramfs-ostree-image/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py
+
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["/opt/LAT/lat/latd"]