diff --git a/repos.d/rpm/openeuler.yaml b/repos.d/rpm/openeuler.yaml
index 31287a75..f11976eb 100644
--- a/repos.d/rpm/openeuler.yaml
+++ b/repos.d/rpm/openeuler.yaml
@@ -1,19 +1,22 @@
 ###########################################################################
 # openEuler
 ###########################################################################
-{% macro openeuler(major, minor, minpackages, suffix='') %}
-- name: openeuler_{{major}}_{{minor}}
+{% macro openeuler(version, minpackages, valid_till=None) %}
+- name: openeuler_{{version|lower|replace('.', '_')|replace('-', '_')}}
   type: repository
-  desc: openEuler {{major}}.{{minor}}{{ suffix }}
+  desc: openEuler {{version}}
   statsgroup: openEuler
   family: centos
   ruleset: [centos, rpm, openeuler]
   minpackages: {{minpackages}}
+  {% if valid_till %}
+  valid_till: {{valid_till}}-01  # only month is specified
+  {% endif %}
   sources:
     - name: source
       fetcher:
         class: RepodataFetcher
-        url: https://repo.openeuler.org/openEuler-{{major}}.{{minor}}{{suffix}}/source/
+        url: https://repo.openeuler.org/openEuler-{{version}}/source/
       parser:
         class: RepodataParser
         vertags: oe
@@ -22,15 +25,31 @@
       url: https://openeuler.org/en/
   packagelinks:
     - type: PACKAGE_SOURCES
-      url: 'https://gitee.com/src-openeuler/{srcname}/tree/openEuler-{{major}}.{{minor}}{{suffix}}/'
+      url: 'https://gitee.com/src-openeuler/{srcname}/tree/openEuler-{{version}}/'
     - type: PACKAGE_RECIPE
-      url: 'https://gitee.com/src-openeuler/{srcname}/blob/openEuler-{{major}}.{{minor}}{{suffix}}/{srcname}.spec'
+      url: 'https://gitee.com/src-openeuler/{srcname}/blob/openEuler-{{version}}/{srcname}.spec'
     - type: PACKAGE_RECIPE_RAW
-      url: 'https://gitee.com/src-openeuler/{srcname}/raw/openEuler-{{major}}.{{minor}}{{suffix}}/{srcname}.spec'
+      url: 'https://gitee.com/src-openeuler/{srcname}/raw/openEuler-{{version}}/{srcname}.spec'
   groups: [ all, production, openeuler, rpm ]
 {% endmacro %}
 
-{{ openeuler('20', '03', suffix='-LTS', minpackages=1500) }}
-{{ openeuler('22', '03', suffix='-LTS', minpackages=3000) }}
-{{ openeuler('23', '09',                minpackages=3000) }}
-{{ openeuler('24', '03', suffix='-LTS', minpackages=3000) }}
+# EoLs: https://www.openeuler.org/en/download/archive/
+{{ openeuler('20.03-LTS',     minpackages=1500, valid_till='2022-03') }}
+{{ openeuler('20.03-LTS-SP1', minpackages=1500, valid_till='2022-12') }}
+{{ openeuler('20.03-LTS-SP2', minpackages=1500, valid_till='2022-04') }}
+{{ openeuler('20.03-LTS-SP3', minpackages=1500, valid_till='2025-12') }}
+{{ openeuler('20.03-LTS-SP4', minpackages=1500, valid_till='2025-12') }}
+
+{{ openeuler('22.03-LTS',     minpackages=3000, valid_till='2024-03') }}
+{{ openeuler('22.03-LTS-SP1', minpackages=3000, valid_till='2024-12') }}
+{{ openeuler('22.03-LTS-SP2', minpackages=3000, valid_till='2024-03') }}
+{{ openeuler('22.03-LTS-SP3', minpackages=3000, valid_till='2025-12') }}
+{{ openeuler('22.03-LTS-SP4', minpackages=3000, valid_till='2026-06') }}
+
+{{ openeuler('23.03',         minpackages=3000, valid_till='2023-09') }}
+
+{{ openeuler('23.09',         minpackages=3000, valid_till='2024-03') }}
+
+{{ openeuler('24.03-LTS',     minpackages=3000, valid_till='2026-05') }}
+
+{{ openeuler('24.09',         minpackages=3000, valid_till='2025-03') }}