diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7480224015..ab38e60f59 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -206,14 +206,14 @@ jobs:
       run: |
         make -C docker centos7
 
-  # We test on fedora35 to make sure we have compatibility with newer compilers (gcc 11)
-  fedora35:
+  # We test on fedora36 to make sure we have compatibility with newer compilers (gcc 12)
+  fedora36:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Build and run tests
       run: |
-        make -C docker fedora35
+        make -C docker fedora36
 
   # We test on rockylinux8 as well
   rocky8:
diff --git a/docker/Makefile b/docker/Makefile
index 012a57e899..7139c1a320 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,5 +1,5 @@
 
-.PHONY: ubuntu plumed2.tgz clean centos7 fedora35 rocky8
+.PHONY: ubuntu plumed2.tgz clean centos7 fedora36 rocky8
 
 ubuntu: plumed2.tgz
 	docker build -t plumed .
@@ -7,8 +7,8 @@ ubuntu: plumed2.tgz
 centos7: plumed2.tgz
 	docker build -t plumed -f centos7 .
 
-fedora35: plumed2.tgz
-	docker build -t plumed -f fedora35 .
+fedora36: plumed2.tgz
+	docker build -t plumed -f fedora36 .
 
 rocky8: plumed2.tgz
 	docker build -t plumed -f rocky8 .
diff --git a/docker/fedora35 b/docker/fedora36
similarity index 98%
rename from docker/fedora35
rename to docker/fedora36
index 164ae9917b..af74f2ef9d 100644
--- a/docker/fedora35
+++ b/docker/fedora36
@@ -1,4 +1,4 @@
-FROM fedora:35
+FROM fedora:36
 
 # note: at variance with centos7, here we have to explicitly install gcc
 RUN yum -y update \