diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a9b875b88..f322f0cc31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 default:
   image:
-    name: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:34
+    name: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:36
     entrypoint: ["/bin/sh", "-c"]
 
 
diff --git a/.gitlab/linux-metadata-validate.yml b/.gitlab/linux-metadata-validate.yml
index b03a66a968..5a757ed63a 100644
--- a/.gitlab/linux-metadata-validate.yml
+++ b/.gitlab/linux-metadata-validate.yml
@@ -6,7 +6,7 @@ validate_linux_metadata:
   needs: []
   interruptible: false
   # This is the only CI image with the utilities needed for this test
-  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:34
+  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:36
   # Due to bug https://github.com/hughsie/appstream-glib/issues/381, this doesn't think our description tag
   # is localized even though it actually is.
   allow_failure: true