diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cbdd56521bfdd5731e5b1995a4e7d0cb4493010..5be1b79457d330408b8470763566dcf88de50407 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,24 @@ upload/centos/7:
 ###################################
 # Fedora
 ###################################
+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: