diff --git a/glusterfs.spec b/glusterfs.spec
index 6543df3..66a9304 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -187,7 +187,6 @@ Version:          @PACKAGE_VERSION@
 Release:          0.@PACKAGE_RELEASE@%{?dist}.5
 %endif
 License:          GPLv2 or LGPLv3+
-Group:            System Environment/Base
 URL:              http://docs.gluster.org/
 %if ( 0%{_for_fedora_koji_builds} )
 Source0:          http://bits.gluster.org/pub/gluster/%{name}/src/%{name}-%{version}%{?prereltag}.tar.gz
@@ -278,7 +277,6 @@ and client framework.
 
 %package api
 Summary:          GlusterFS api library
-Group:            System Environment/Daemons
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-client-xlators = %{version}-%{release}
 
@@ -295,7 +293,6 @@ This package provides the glusterfs libgfapi library.
 
 %package api-devel
 Summary:          Development Libraries
-Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-devel = %{version}-%{release}
 Requires:         libacl-devel
@@ -313,7 +310,6 @@ This package provides the api include files.
 
 %package cli
 Summary:          GlusterFS CLI
-Group:            Applications/File
 Requires:         %{name}-libs = %{version}-%{release}
 
 %description cli
@@ -329,7 +325,6 @@ This package provides the GlusterFS CLI application and its man page
 
 %package client-xlators
 Summary:          GlusterFS client-side translators
-Group:            Applications/File
 
 %description client-xlators
 GlusterFS is a distributed file-system capable of scaling to several
@@ -344,7 +339,6 @@ This package provides the translators needed on any GlusterFS client.
 
 %package devel
 Summary:          Development Libraries
-Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 # Needed for the Glupy examples to work
 Requires:         %{name}-extra-xlators = %{version}-%{release}
@@ -364,7 +358,6 @@ This package provides the development libraries and include files.
 %if ( 0%{!?_without_events:1} )
 %package events
 Summary:          GlusterFS Events
-Group:            Applications/File
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
 Requires:         python2 python-prettytable
 Requires:         python2-gluster = %{version}-%{release}
@@ -396,7 +389,6 @@ This package provides the GlusterFS Events
 
 %package extra-xlators
 Summary:          Extra Gluster filesystem Translators
-Group:            Applications/File
 # We need python2-gluster rpm for gluster module's __init__.py in Python
 # site-packages area
 Requires:         python2-gluster = %{version}-%{release}
@@ -419,7 +411,6 @@ for GlusterFS.
 
 %package fuse
 Summary:          Fuse client
-Group:            Applications/File
 BuildRequires:    fuse-devel
 Requires:         attr
 Requires:         psmisc
@@ -445,7 +436,6 @@ glusterfsd and glusterfs binaries.
 %if ( 0%{!?_without_georeplication:1} )
 %package geo-replication
 Summary:          GlusterFS Geo-replication
-Group:            Applications/File
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-server = %{version}-%{release}
 Requires:         python2
@@ -471,7 +461,6 @@ This package provides support to geo-replication.
 %if ( 0%{?_with_gnfs:1} )
 %package gnfs
 Summary:          GlusterFS gNFS server
-Group:            System Environment/Daemons
 Requires:         %{name}%{?_isa} = %{version}-%{release}
 Requires:         %{name}-client-xlators%{?_isa} = %{version}-%{release}
 Requires:         nfs-utils
@@ -490,7 +479,6 @@ This package provides the glusterfs legacy gNFS server xlator
 
 %package libs
 Summary:          GlusterFS common libraries
-Group:            Applications/File
 
 %description libs
 GlusterFS is a distributed file-system capable of scaling to several
@@ -505,7 +493,6 @@ This package provides the base GlusterFS libraries
 
 %package -n python-gluster
 Summary:          GlusterFS python library
-Group:            Development/Tools
 %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) )
 # EL5 does not support noarch sub-packages
 BuildArch:        noarch
@@ -527,7 +514,6 @@ namespace.
 
 %package -n python2-gluster
 Summary:          GlusterFS python library
-Group:            Development/Tools
 %{?python_provide:%python_provide python2-gluster}
 Requires:         python2
 Provides:         python-gluster = %{version}-%{release}
@@ -538,7 +524,6 @@ Obsoletes:        python-gluster < 3.10
 %if ( 0%{!?_without_rdma:1} )
 %package rdma
 Summary:          GlusterFS rdma support for ib-verbs
-Group:            Applications/File
 %if ( 0%{?fedora} && 0%{?fedora} > 26 )
 BuildRequires:    rdma-core-devel
 %else
@@ -562,7 +547,6 @@ This package provides support to ib-verbs library.
 %if ( ! 0%{_for_fedora_koji_builds} )
 %package regression-tests
 Summary:          Development Tools
-Group:            Development/Tools
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-fuse = %{version}-%{release}
 Requires:         %{name}-server = %{version}-%{release}
@@ -585,12 +569,6 @@ License:          GPLv3+
 # EL5 does not support noarch sub-packages
 BuildArch:        noarch
 %endif
-# this Group handling comes from the Fedora resource-agents package
-%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} )
-Group:            System Environment/Base
-%else
-Group:            Productivity/Clustering/HA
-%endif
 # for glusterd
 Requires:         %{name}-server = %{version}-%{release}
 # depending on the distribution, we need pacemaker or resource-agents
@@ -612,7 +590,6 @@ like Pacemaker.
 
 %package server
 Summary:          Distributed file-system server
-Group:            System Environment/Daemons
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-libs = %{version}-%{release}
 Requires:         %{name}-cli = %{version}-%{release}