diff --git a/_multibuild b/_multibuild
index 4c0ab8a..eb2bf3f 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,4 +1,4 @@
 <multibuild>
-  <flavor>coreutils-single</flavor>
-  <flavor>coreutils-testsuite</flavor>
+  <flavor>single</flavor>
+  <flavor>testsuite</flavor>
 </multibuild>
diff --git a/coreutils.changes b/coreutils.changes
index 772d786..3af249b 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 08:13:51 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- disable single and testsuite builds in rings/staging
+- remove duplicate "coreutils" in flavor to make it look nicer in OBS
+
 -------------------------------------------------------------------
 Mon Jan 20 15:00:06 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>
 
diff --git a/coreutils.spec b/coreutils.spec
index b866a4d..6195358 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -16,12 +16,18 @@
 #
 
 
+%bcond_with ringdisabled
+
 %global build_flavor @BUILD_FLAVOR@%{nil}
 %if "%build_flavor" == ""
-%global build_flavor coreutils
+%undefine build_flavor
+%else
+%if %{with ringdisabled}
+ExclusiveArch:  do_not_build
+%endif
 %endif
 
-Name:           %build_flavor
+Name:           coreutils%{?build_flavor:-%build_flavor}
 Summary:        GNU Core Utilities
 License:        GPL-3.0-or-later
 Group:          System/Base