diff --git a/system-user-ftp.conf b/system-user-ftp.conf
index 538d169..4cbc2bd 100644
--- a/system-user-ftp.conf
+++ b/system-user-ftp.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
 u ftp - "FTP Account" /srv/ftp
-g ftp -
diff --git a/system-user-games.conf b/system-user-games.conf
index 7810be0..75f3fe9 100644
--- a/system-user-games.conf
+++ b/system-user-games.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g games -
 u games - "Games account" /var/games
diff --git a/system-user-mail.conf b/system-user-mail.conf
index 6d94b5c..39f4a58 100644
--- a/system-user-mail.conf
+++ b/system-user-mail.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
 u mail - "Mailer daemon" /var/spool/clientmqueue
-g mail -
diff --git a/system-user-news.conf b/system-user-news.conf
index 8defcf2..51c6a32 100644
--- a/system-user-news.conf
+++ b/system-user-news.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g news - 
 u news - "News system" /etc/news
diff --git a/system-user-tftp.conf b/system-user-tftp.conf
index d45b7eb..b20ec7e 100644
--- a/system-user-tftp.conf
+++ b/system-user-tftp.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g tftp -
 u tftp - "TFTP Account" /srv/tftpboot
diff --git a/system-user-tss.conf b/system-user-tss.conf
index 196ad1b..df2729e 100644
--- a/system-user-tss.conf
+++ b/system-user-tss.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g tss 98 "TPM device access"
 u tss 98 "TSS daemon" /var/lib/tpm
diff --git a/system-user-uucp.conf b/system-user-uucp.conf
index 3bdf51d..4974dc9 100644
--- a/system-user-uucp.conf
+++ b/system-user-uucp.conf
@@ -1,4 +1,3 @@
 # Type Name ID GECOS [HOME]
-g uucp - 
 u uucp - "Unix-to-Unix CoPy system" /etc/uucp
 m uucp lock
diff --git a/system-user-uuidd.conf b/system-user-uuidd.conf
index d7efe01..57bb1d5 100644
--- a/system-user-uuidd.conf
+++ b/system-user-uuidd.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
-g uuidd - 
 u uuidd - "User for uuidd" /var/run/uuidd
diff --git a/system-users.changes b/system-users.changes
index c90b3e3..20b7664 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jan 14 16:30:39 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- system-user-tss.conf: Remove group entry, not needed and did
+  contain syntax errors
+- remove duplicate group entry:
+  - system-user-tftp.conf
+  - system-user-uuidd.conf
+  - system-user-uucp.conf
+  - system-user-uucp.conf
+  - system-user-ftp.conf
+  - system-user-games.conf
+  - system-user-news.conf
+
 -------------------------------------------------------------------
 Fri Jan  8 14:23:45 UTC 2021 - Martin Hauke <mardnh@gmx.de>