diff --git a/installation-images.spec b/installation-images.spec
index d4bf61c..2a1717a 100644
--- a/installation-images.spec
+++ b/installation-images.spec
@@ -117,6 +117,10 @@ ExclusiveArch:  do_not_build
 %endif
 %endif
 
+# ===  set product string (based on required packages)  ===
+
+%global product_name %(bash %_sourcedir/product_name)
+
 # ===  define each theme  ===
 
 %if "%{?theme}" == ""
@@ -146,6 +150,10 @@ BuildRequires:  adobe-sourcesanspro-fonts
 %define config_bootmenu_no_upgrade 1
 BuildRequires:  openSUSE-MicroOS-release
 BuildRequires:  adobe-sourcesanspro-fonts
+
+# Kubic is based on MicroOS but we don't want this to show
+# note: keep this in sync with the Kubic settings in etc/config
+%global product_name openSUSE-Kubic
 %endif
 
 %if "%theme" == "MicroOS"
@@ -216,14 +224,9 @@ BuildRequires:  skelcd-fallbackrepo-CAASP
 BuildRequires:  caasp-release
 %endif
 
-# ===  set product string (based on required packages)  ===
+# ===  product name with architecture appended  ===
 
-%global product_name %(bash %_sourcedir/product_name)-%{_target_cpu}
-%if "%{flavor}" == "Kubic"
-# For Kubic, the underlying product is in fact MicroOS, but we want to distinguish ourselves here
-# The name is shown in the build log and used to name the tftpboot- sub package
-%global product_name openSUSE-Kubic-%{_target_cpu}
-%endif
+%global product_name_arch %product_name-%{_target_cpu}
 
 # ===  branding specific packages  ===
 
@@ -625,13 +628,13 @@ You can create an initrd for %theme installation. Useful, for example, to set
 up a UML or XEN environment.
 
 
-%package -n     tftpboot-installation-%{product_name}
+%package -n     tftpboot-installation-%{product_name_arch}
 AutoReqProv:    off
 Summary:        tftp installation tree
 Group:          System/Management
 BuildArch:      noarch
 
-%description -n tftpboot-installation-%{product_name}
+%description -n tftpboot-installation-%{product_name_arch}
 This package contains the kernel, initrd and installation images
 to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64.
 
@@ -681,7 +684,7 @@ Package that holds debuginfo dependencies for image files in installation-image.
 rm -f /usr/lib/build/checks/04-check-filelist
 
 %build
-echo building product "'%product_name'"
+echo building product "'%product_name_arch'"
 unset MALLOC_CHECK_
 BUILD_DISTRIBUTION_NAME="%distribution"
 export BUILD_DISTRIBUTION_NAME
@@ -724,13 +727,6 @@ test ! -z "$BUILD_DISTRIBUTION_NAME"
 make install DESTDIR=%{buildroot} THEMES=%theme
 # make debuginfo DESTDIR=%{buildroot}
 make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=%theme
-%if "%{flavor}" == "Kubic"
-# openSUSE Kubic is a special case: it is openSUSE MicroOS, but with different control files
-# In order to allow the MicroOS and Kubic tftpboot to co-exist, we rename the directory in
-# case of flavor Kubic
-mv %{buildroot}%{_datadir}/tftpboot-installation/openSUSE-MicroOS-%{_target_cpu} \
-   %{buildroot}%{_datadir}/tftpboot-installation/%{product_name}
-%endif
 ln -s %theme %{buildroot}/usr/lib/install-initrd/branding
 install -d -m 755 %{buildroot}/usr/sbin
 install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin
@@ -795,7 +791,7 @@ rm -rf %{buildroot}
 
 %files -n install-initrd-%{theme} -f install-initrd.files
 
-%files -n tftpboot-installation-%{product_name}
+%files -n tftpboot-installation-%{product_name_arch}
 %defattr(-,root,root)
 %dir %attr(0755,tftp,tftp) /usr/share/tftpboot-installation
 /usr/share/tftpboot-installation