diff --git a/_multibuild b/_multibuild
index 98684615..ac179820 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,6 @@
 <multibuild>
   <package>MicroOS-dvd5-dvd-x86_64</package>
-  <package>openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64</package>
+  <package>openSUSE-Addon-NonOss-ftp-ftp-x86_64</package>
   <package>openSUSE-cd-mini-x86_64</package>
   <package>openSUSE-dvd5-dvd-x86_64</package>
   <package>openSUSE-ftp-ftp-x86_64</package>
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
similarity index 98%
rename from openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
rename to openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
index 0d571274..686a6f61 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi
@@ -17,14 +17,13 @@
       <arch id="i686" name="dummy" fallback="i586"/>
       <arch id="noarch" name="dummy"/>
       <arch id="x86_64" name="dummy" fallback="i686"/>
-      <requiredarch ref="i586"/>
       <requiredarch ref="x86_64"/>
     </architectures>
     <productoptions>
       <productvar name="DISTNAME">openSUSE-Addon-NonOss</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-Addon-NonOss-FTP-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-Addon-NonOss-FTP-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -40,7 +39,7 @@
       <productinfo name="CONTENTSTYLE">11</productinfo>
       <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20230327,openSUSE NonOSS Addon</productinfo>
       <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230327/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230327/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230327/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -51,7 +50,7 @@
       <source path="obs://openSUSE:Factory:NonFree/standard"/>
     </instrepo>
     <metadata>
-      <repopackage name="skelcd-openSUSE-non-OSS" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
+      <repopackage name="skelcd-openSUSE-non-OSS" medium="0" removearch="src,nosrc" onlyarch="x86_64"/>
     </metadata>
     <repopackages>
       <repopackage name="*"/>
@@ -482,7 +481,7 @@
       <repopackage name="yast2-trans-my" onlyarch="skipit"/>
       <repopackage name="yast2-trans-tk" onlyarch="skipit"/>
       <repopackage name="yast2-wagon-control-SLE" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release" addarch="i586,x86_64"/>
+      <repopackage name="openSUSE-Addon-NonOss-release" addarch="x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index 780ca6e2..85ddb664 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -88,7 +88,6 @@
                use_suggested="false">
           <use group="NON_FTP_PACKAGES" create_pattern="false" />
           <archsets>                 
-            <archset ref="i586" />
             <archset ref="x86_64" />
           </archsets>
           <metadata>