diff --git a/config.yml b/config.yml
index 84fd77e1..4f59986a 100644
--- a/config.yml
+++ b/config.yml
@@ -7,8 +7,10 @@ versions:
   - "8.10"
   - "9"
   - "9.7"
+  - "9.8"
   - "10"
   - "10.1"
+  - "10.2"
 # requires full version in arches, no base version inheritance
 optional_module_versions:
   kitten:
@@ -92,13 +94,17 @@ repos:
     path: CRB/$basearch/os/
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: nfv
     path: NFV/$basearch/os/
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
     arches:
       - x86_64
   - name: rt
@@ -106,7 +112,9 @@ repos:
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
     arches:
       - x86_64
   - name: extras
@@ -114,7 +122,9 @@ repos:
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: extras-common
     path: extras-common/$basearch/os/
     versions:
@@ -127,19 +137,25 @@ repos:
     path: HighAvailability/$basearch/os/
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: sap
     path: SAP/$basearch/os/
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: saphana
     path: SAPHANA/$basearch/os/
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: resilientstorage
     path: ResilientStorage/$basearch/os/
     arches:
@@ -149,12 +165,15 @@ repos:
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
   - name: devel
     path: devel/$basearch/os/
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
     arches:
       - x86_64
       - aarch64
@@ -163,13 +182,17 @@ repos:
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: synergy
     path: synergy/$basearch/os/
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
 
   # sources repos
   - name: baseos-source
@@ -188,28 +211,36 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: nfv-source
     path: NFV/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: rt-source
     path: RT/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: extras-source
     path: extras/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: extras-common-source
     path: extras-common/Source/
     vault: true
@@ -225,14 +256,18 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: sap-source
     path: SAP/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: saphana-source
     path: SAPHANA/Source/
     vault: true
@@ -244,27 +279,34 @@ repos:
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
   - name: devel-source
     path: devel/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: plus-source
     path: plus/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: synergy-source
     path: synergy/Source/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
 
   # debug repos
   - name: baseos-debuginfo
@@ -277,7 +319,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: appstream-debuginfo
     path: AppStream/debug/$basearch/
     vault: true
@@ -288,7 +332,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: powertools-debuginfo
     path: PowerTools/debug/$basearch/
     vault: true
@@ -299,7 +345,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: nfv-debuginfo
     path: NFV/debug/$basearch/
     vault: true
@@ -310,7 +358,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
     arches:
       - x86_64
   - name: rt-debuginfo
@@ -323,7 +373,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
     arches:
       - x86_64
   - name: extras-debuginfo
@@ -336,7 +388,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: extras-common-debug
     path: extras-common/debug/$basearch/
     vault: true
@@ -352,19 +406,25 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: sap-debug
     path: SAP/debug/$basearch/
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: saphana-debug
     path: SAPHANA/debug/$basearch/
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: sap-debuginfo
     path: SAP/debug/$basearch/
     vault: true
@@ -389,6 +449,7 @@ repos:
       - s390x
     versions:
       - "9.7"
+      - "9.8"
   - name: devel-debuginfo
     path: devel/debug/$basearch/
     vault: true
@@ -402,7 +463,9 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: plus-debuginfo
     path: plus/debug/$basearch/
     vault: true
@@ -413,14 +476,18 @@ repos:
     vault: true
     versions:
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
   - name: synergy-debuginfo
     path: synergy/debug/$basearch/
     vault: true
     versions:
       - "8.10"
       - "9.7"
+      - "9.8"
       - "10.1"
+      - "10.2"
 
   ## raspberry pi repos
   - name: raspberrypi