diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff6b8f58609855cd33e8624133cc9fccf82bdb4f..51e8f430d6bb64ebe650929a659a8e8fc0253aee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,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: