diff --git a/_multibuild b/_multibuild
index 1486389..fe124d0 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,3 +1,7 @@
 <multibuild>
   <package>gnu-hpc</package>
+  <package>gnu8-hpc</package>
+  <package>gnu9-hpc</package>
+  <package>gnu10-hpc</package>
+  <package>gnu11-hpc</package>
 </multibuild>
diff --git a/gnu-compilers-hpc.changes b/gnu-compilers-hpc.changes
index f9fae25..41c6861 100644
--- a/gnu-compilers-hpc.changes
+++ b/gnu-compilers-hpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 13 16:45:02 UTC 2021 - Antoine Ginies <aginies@suse.com>
+
+- fix _multibuild with a correct list of gcc version
+
 -------------------------------------------------------------------
 Wed Oct  6 18:50:31 UTC 2021 - Egbert Eich <eich@suse.com>
 
diff --git a/gnu-compilers-hpc.spec b/gnu-compilers-hpc.spec
index 2ced773..bb5babc 100644
--- a/gnu-compilers-hpc.spec
+++ b/gnu-compilers-hpc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnu
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -49,12 +49,17 @@ ExclusiveArch:  do_not_build
 
 %if "%flavor" == "gnu10-hpc"
 %define c_f_ver 10
-%endif
+%endif 
 
 %if "%flavor" == "gnu11-hpc"
 %define c_f_ver 11
 %endif
 
+# For Factory only build the default
+%if 0%{?suse_version} > 1500 && "%flavor" != "gnu-hpc"
+ExclusiveArch:  do-not-build
+%endif
+
 %{!?_rpmmacrodir:%define _rpmmacrodir %{_sysconfdir}/rpm}
 # Keep in sync with macros.hpc-gnu
 # ab >= 40 - version: a.b to accompodate for old gcc version scheme of gcc < 5