diff --git a/configs/sst_desktop_applications-evolution-data-server.yaml b/configs/sst_desktop_applications-evolution-data-server.yaml
new file mode 100644
index 00000000..9cba0526
--- /dev/null
+++ b/configs/sst_desktop_applications-evolution-data-server.yaml
@@ -0,0 +1,15 @@
+document: feedback-pipeline-workload
+version: 1
+data:
+  name: Evolution Data Server
+  description: Unified backend for programs that work with contacts, tasks, and calendar information
+  maintainer: sst_desktop_applications
+
+  packages:
+  - evolution-data-server
+  - evolution-data-server-langpacks
+  - evolution-ews
+  - evolution-ews-langpacks
+
+  labels:
+  - eln
diff --git a/configs/sst_desktop_applications-evolution-eln.yaml b/configs/sst_desktop_applications-evolution-eln.yaml
deleted file mode 100644
index dcec8be9..00000000
--- a/configs/sst_desktop_applications-evolution-eln.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-document: feedback-pipeline-workload
-version: 1
-data:
-  name: Evolution
-  description: Personal information management application for Workstation
-  maintainer: sst_desktop_applications
-
-  packages:
-  - evolution
-  - evolution-bogofilter
-  - evolution-data-server
-  - evolution-data-server-langpacks
-  - evolution-devel
-  - evolution-ews
-  - evolution-ews-langpacks
-  - evolution-help
-  - evolution-langpacks
-  - evolution-pst
-  - evolution-spamassassin
-
-  labels:
-  - eln
diff --git a/configs/sst_desktop_applications-unwanted-eln.yaml b/configs/sst_desktop_applications-unwanted-eln.yaml
index f6080980..9099dbf9 100644
--- a/configs/sst_desktop_applications-unwanted-eln.yaml
+++ b/configs/sst_desktop_applications-unwanted-eln.yaml
@@ -98,6 +98,9 @@ data:
   - enchant
   # Replaced by Loupe
   - eog
+  # Thunderbird is the only shipped desktop email client in RHEL 10
+  # evolution-data-server stays as it's needed by GNOME
+  - evolution
 
   labels:
   - eln