diff --git a/.cirrus.yml b/.cirrus.yml
index 7379b4802e..6467129335 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -136,10 +136,10 @@ fedora35_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-fedora34_task:
+fedora36_task:
   container:
-    # Fedora 34 EOL: Around May 2022
-    dockerfile: ci/fedora-34/Dockerfile
+    # Fedora 36 EOL: Around May 2023
+    dockerfile: ci/fedora-36/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
diff --git a/ci/fedora-34/Dockerfile b/ci/fedora-36/Dockerfile
similarity index 92%
rename from ci/fedora-34/Dockerfile
rename to ci/fedora-36/Dockerfile
index aaee737b97..c3a6629842 100644
--- a/ci/fedora-34/Dockerfile
+++ b/ci/fedora-36/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora:34
+FROM fedora:36
 
 # A version field to invalide Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20220519
+ENV DOCKERFILE_VERSION 20220614
 
 RUN dnf -y install \
     bison \