diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ab20ee..92232c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,9 +41,6 @@ variables:
   - master
   - tags
 
-###################################
-# EPEL
-###################################
 build/centos/7:
   <<: *build
   variables:
@@ -60,3 +57,39 @@ upload/centos/7:
   <<: *upload
   dependencies:
   - build/centos/7
+
+build/fedora/36:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: fedora/36
+    RPM_BUILD_NCPUS: '1'
+
+test/fedora/36:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: fedora/36
+  dependencies:
+    - build/fedora/36
+
+upload/fedora/36:
+  <<: *upload
+  dependencies:
+    - build/fedora/36
+
+build/fedora/35:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: fedora/35
+    RPM_BUILD_NCPUS: '1'
+
+test/fedora/35:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: fedora/35
+  dependencies:
+    - build/fedora/35
+
+upload/fedora/35:
+  <<: *upload
+  dependencies:
+    - build/fedora/35