diff --git a/system_files/desktop/shared/usr/libexec/containerbuild/image-info b/system_files/desktop/shared/usr/libexec/containerbuild/image-info
index b2a0f74ace..790f034194 100755
--- a/system_files/desktop/shared/usr/libexec/containerbuild/image-info
+++ b/system_files/desktop/shared/usr/libexec/containerbuild/image-info
@@ -18,7 +18,7 @@ if [[ $IMAGE_BRANCH_NORMALIZED == "main" ]]; then
   IMAGE_BRANCH_NORMALIZED="stable"
 fi
 
-case $FEDORA_MAJOR_VERSION in
+case "$FEDORA_MAJOR_VERSION" in
   39|40)
     IMAGE_TAG="stable"
     ;;
@@ -41,19 +41,23 @@ cat > $IMAGE_INFO <<EOF
 }
 EOF
 
-CODE_NAME="Base"
-
-case $BASE_IMAGE_NAME in
+case "$BASE_IMAGE_NAME" in
+  *deck*)
+    CODE_NAME="Handheld/HTPC"
+    ;;
   *nvidia*)
-    CODE_NAME="Nvidia";;
-  *deck*|*ally*)
-    CODE_NAME="Deck";;
-  *asus*)
-    CODE_NAME="ASUS";;
+    CODE_NAME="Nvidia Desktop/Laptop"
+    ;;
+  *asus*|*ally*)
+    CODE_NAME="ASUS HWE"
+    ;;
+  *)
+    CODE_NAME="Desktop/Laptop"
+    ;;
 esac
 
 # OS Release File
-sed -i "s/VARIANT_ID.*/VARIANT_ID=$IMAGE_NAME/" /usr/lib/os-release
+sed -i "s/^VARIANT_ID=.*/VARIANT_ID=$IMAGE_NAME/" /usr/lib/os-release
 sed -i "s/^PRETTY_NAME=.*/PRETTY_NAME=\"Bazzite (FROM Fedora ${BASE_IMAGE_NAME^} $FEDORA_MAJOR_VERSION)\"/" /usr/lib/os-release
 sed -i "s/^NAME=.*/NAME=\"$IMAGE_PRETTY_NAME\"/" /usr/lib/os-release
 sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release
@@ -62,12 +66,12 @@ sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:universal-blue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release
 sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release
-sed -i "s/^ID=.*/ID=${IMAGE_PRETTY_NAME,}\nID_LIKE=\"rhel centos fedora\"/" /usr/lib/os-release
+sed -i "s/^ID=fedora/ID=${IMAGE_PRETTY_NAME,}\nID_LIKE=\"rhel centos fedora\"/" /usr/lib/os-release
 sed -i "s/^LOGO=.*/LOGO=$LOGO_ICON/" /usr/lib/os-release
 sed -i "s/^ANSI_COLOR=.*/ANSI_COLOR=\"$LOGO_COLOR\"/" /usr/lib/os-release
 sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release
-sed -i "s/^VERSION_CODENAME=.*/VERSION_CODENAME=\"$CODE_NAME\"/" /usr/lib/os-release
+sed -i "s|^VERSION_CODENAME=.*|VERSION_CODENAME=\"$CODE_NAME\"|" /usr/lib/os-release
 
-if [ -n "${SHA_HEAD_SHORT:-}" ]; then
+if [[ -n "${SHA_HEAD_SHORT:-}" ]]; then
   echo "BUILD_ID=\"$SHA_HEAD_SHORT\"" >> /usr/lib/os-release
 fi
\ No newline at end of file