diff --git a/.gitlab/Fedora-Linux-CI.yml b/.gitlab/Fedora-Linux-CI.yml
index 0ffd0782cc..4ea94cc85b 100644
--- a/.gitlab/Fedora-Linux-CI.yml
+++ b/.gitlab/Fedora-Linux-CI.yml
@@ -6,7 +6,7 @@
 # Don't tag until we have separate CI for MRs
 #  tags:
 #    - kicad-fedora
-  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:34
+  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:36
   extends: .only_code
   interruptible: false
   cache:
diff --git a/.gitlab/coverity.yml b/.gitlab/coverity.yml
index 49f988779c..8a13b0fdcd 100644
--- a/.gitlab/coverity.yml
+++ b/.gitlab/coverity.yml
@@ -39,8 +39,7 @@ Coverity:
   tags:
     - coverity
   stage: build
-  # Use Fedora 33 because Coverity needs GCC 10 still (as of 06/16/2021)
-  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:33
+  image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:36
   only:
     refs:
       - schedules
diff --git a/doxygen/doxygen.Dockerfile b/doxygen/doxygen.Dockerfile
index 4e382a047c..9e87c0aab5 100644
--- a/doxygen/doxygen.Dockerfile
+++ b/doxygen/doxygen.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:34 as build-doxygen-env
+FROM registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:36 as build-doxygen-env
 USER root
 
 WORKDIR /src