diff --git a/jetty-alpn.spec b/jetty-alpn.spec
index 66852b6..ef54a09 100644
--- a/jetty-alpn.spec
+++ b/jetty-alpn.spec
@@ -139,7 +139,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
 
 # TODO remove when jetty-setuid is packaged
-%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml
+%pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
 
 # We don't have gcloud-java-datastore
 %pom_disable_module jetty-gcloud
diff --git a/jetty-http2.spec b/jetty-http2.spec
index 99f15ec..325f0a9 100644
--- a/jetty-http2.spec
+++ b/jetty-http2.spec
@@ -162,7 +162,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
 
 # TODO remove when jetty-setuid is packaged
-%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml
+%pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
 
 # We don't have gcloud-java-datastore
 %pom_disable_module jetty-gcloud
diff --git a/jetty-minimal.changes b/jetty-minimal.changes
index 9be6c4b..7788196 100644
--- a/jetty-minimal.changes
+++ b/jetty-minimal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 17 09:47:04 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
+
+- Fix the Group tag for jetty-server subpackage
+- Clean up spec files
+
 -------------------------------------------------------------------
 Tue Oct 15 21:27:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jetty-minimal.spec b/jetty-minimal.spec
index a0ddbe6..d445167 100644
--- a/jetty-minimal.spec
+++ b/jetty-minimal.spec
@@ -209,8 +209,7 @@ Group:          Productivity/Networking/Web/Servers
 
 %package        -n %{base_name}-server
 Summary:        The server module for Jetty
-# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Productivity/Neorg.apache.maven.plugins:maven-dependency-plugintworking/Web/Servers
+Group:          Productivity/Networking/Web/Servers
 
 %description    -n %{base_name}-server
 %{extdesc} %{summary}.
@@ -333,7 +332,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
 
 # TODO remove when jetty-setuid is packaged
-%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml
+%pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
 
 # We don't have gcloud-java-datastore
 %pom_disable_module jetty-gcloud
diff --git a/jetty-unixsocket.spec b/jetty-unixsocket.spec
index da2a551..2afbf9f 100644
--- a/jetty-unixsocket.spec
+++ b/jetty-unixsocket.spec
@@ -121,7 +121,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
 
 # TODO remove when jetty-setuid is packaged
-%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml
+%pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
 
 # We don't have gcloud-java-datastore
 %pom_disable_module jetty-gcloud
diff --git a/jetty-websocket.spec b/jetty-websocket.spec
index 5455166..5ab9959 100644
--- a/jetty-websocket.spec
+++ b/jetty-websocket.spec
@@ -174,7 +174,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
 
 # TODO remove when jetty-setuid is packaged
-%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml
+%pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
 
 # We don't have gcloud-java-datastore
 %pom_disable_module jetty-gcloud