diff --git a/baseiso-containment.changes b/baseiso-containment.changes
index 405e932..b2ce40f 100644
--- a/baseiso-containment.changes
+++ b/baseiso-containment.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Feb 26 21:54:34 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- 0.2.3
+  * add the flavour name, if any, to the output package name 
+
+-------------------------------------------------------------------
+Thu Feb 20 09:16:37 UTC 2025 - Max Lin <mlin@suse.com>
+
+- add %changelog to baseiso.spec.in
+  * avoid source_date_epoch_from_changelog set but %changelog
+    is missing
+
 -------------------------------------------------------------------
 Fri Jan 31 11:13:04 UTC 2025 - Giacomo Leidi <giacomo.leidi@suse.com>
 
diff --git a/baseiso-containment.spec b/baseiso-containment.spec
index 3eb5eda..6c21025 100644
--- a/baseiso-containment.spec
+++ b/baseiso-containment.spec
@@ -17,7 +17,7 @@
 
 
 Name:           baseiso-containment
-Version:        0.2.2
+Version:        0.2.3
 Release:        0
 Summary:        Wraps Agama build for product composer
 License:        MIT
diff --git a/baseiso.spec.in b/baseiso.spec.in
index 84f5c66..381c1fe 100644
--- a/baseiso.spec.in
+++ b/baseiso.spec.in
@@ -1,13 +1,13 @@
 # needsrootforbuild
 
 Url:            http://www.suse.com/
-Name:           baseiso-__NAME__
+Name:           baseiso-__NAME____FLAVOR__
 Summary:        Product Composer Base Images
 Version:        __VERSION__
 Release:        __RELEASE__
 Group:          System/Management
 License:        SUSE-EULA
-Provides:       baseiso(__NAME__)
+Provides:       baseiso(__NAME____FLAVOR__)
 
 %define install_dir %_libexecdir/base-isos
 
@@ -19,6 +19,21 @@ for Agama Installer in first place.
 mkdir -p %buildroot%{install_dir}
 cp -a /usr/src/packages/KIWI/* %buildroot%install_dir
 
+if [ -n "__FLAVOR__" ]; then
+  # Rename the files so that they match what product-composer
+  # expect
+  for path in %{buildroot}%{install_dir}/__NAME__*; do
+    filename="$(basename $path)"
+    target_filename="${filename//__NAME__//__NAME____FLAVOR__}"
+    mv -v ${path} %{buildroot}%{install_dir}/${target_filename}
+    
+    if [[ ${filename} == *.sha256 ]]; then
+      sed -i "s|__NAME__|__NAME____FLAVOR__|g" %{buildroot}%{install_dir}/${target_filename}
+    fi
+  done
+fi
+
 %files
 %install_dir
 
+%changelog
diff --git a/baseiso_post_run b/baseiso_post_run
index b810012..36d8d0c 100644
--- a/baseiso_post_run
+++ b/baseiso_post_run
@@ -51,6 +51,7 @@ iso_version=${iso_version%-*}
 
 
 IMAGE=$iso_name
+[ -n "$iso_flavor" ] && FLAVOR=-$iso_flavor
 
 shopt -s nullglob
 shopt -s extglob
@@ -58,6 +59,7 @@ shopt -s extglob
 echo "Attempting to wrap $IMAGE in a containment rpm ..."
 
 sed -e "s@__NAME__@$iso_name@g" \
+    -e "s@__FLAVOR__@$FLAVOR@g" \
     -e "s@__VERSION__@$iso_version@g" \
     -e "s@__RELEASE__@$iso_build@g" \
     < $SPEC_IN \
@@ -72,5 +74,5 @@ fi
 # required for the BS to find the rpm, because it is
 # a "non-standard result file for KIWI"
 mkdir -p $TOPDIR/OTHER
-mv $TOPDIR/RPMS/$ARCH/baseiso-$iso_name-$iso_version-$iso_build.$ARCH.rpm $TOPDIR/OTHER/
-mv $TOPDIR/SRPMS/baseiso-$iso_name-$iso_version-$iso_build.src.rpm $TOPDIR/OTHER/
+mv $TOPDIR/RPMS/$ARCH/baseiso-$iso_name$FLAVOR-$iso_version-$iso_build.$ARCH.rpm $TOPDIR/OTHER/
+mv $TOPDIR/SRPMS/baseiso-$iso_name$FLAVOR-$iso_version-$iso_build.src.rpm $TOPDIR/OTHER/