diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5abafa9..8bdb584 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,9 +48,6 @@ variables:
     - master
     - tags
 
-###################################
-# EPEL
-###################################
 build/centos/7:
   <<: *build
   variables:
@@ -68,9 +65,6 @@ upload/centos/7:
   dependencies:
     - build/centos/7
 
-###################################
-# Fedora
-###################################
 build/fedora/36:
   <<: *build
   variables:
@@ -107,27 +101,23 @@ upload/fedora/35:
   dependencies:
     - build/fedora/35
 
-build/fedora/34:
+build/opensuse/15.4:
   <<: *build
   variables:
-    DOCKER_IMAGE: fedora/34
-    RPM_BUILD_NCPUS: '1'
+    DOCKER_IMAGE: opensuse/15.4
 
-test/fedora/34:
+test/opensuse/15.4:
   <<: *test
   variables:
-    DOCKER_IMAGE: fedora/34
+    DOCKER_IMAGE: opensuse/15.4
   dependencies:
-    - build/fedora/34
+  - build/opensuse/15.4
 
-upload/fedora/34:
+upload/opensuse/15.4:
   <<: *upload
   dependencies:
-    - build/fedora/34
+  - build/opensuse/15.4
 
-###################################
-# openSUSE
-###################################
 build/opensuse/15.3:
   <<: *build
   variables:
@@ -140,7 +130,7 @@ test/opensuse/15.3:
   dependencies:
   - build/opensuse/15.3
 
-upload/openSUSE/15.3:
+upload/opensuse/15.3:
   <<: *upload
   dependencies:
   - build/opensuse/15.3