diff --git a/.zuul.yaml b/.zuul.yaml
index f714e8cee..71d85c39d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -49,24 +49,24 @@
     run: playbooks/system-test.yaml
 
 - job:
-    name: system-test-fedora-36
-    description: Run Toolbx's system tests in Fedora 36
+    name: system-test-fedora-37
+    description: Run Toolbx's system tests in Fedora 37
     timeout: 2400
     nodeset:
       nodes:
-        - name: fedora-36
-          label: cloud-fedora-36
+        - name: fedora-37
+          label: cloud-fedora-37
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
 - job:
-    name: system-test-fedora-35
-    description: Run Toolbox's system tests in Fedora 35
+    name: system-test-fedora-36
+    description: Run Toolbx's system tests in Fedora 36
     timeout: 2400
     nodeset:
       nodes:
-        - name: fedora-35
-          label: cloud-fedora-35
+        - name: fedora-36
+          label: cloud-fedora-36
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
@@ -74,19 +74,19 @@
     periodic:
       jobs:
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35
     check:
       jobs:
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35
     gate:
       jobs:
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35
diff --git a/doc/toolbox-run.1.md b/doc/toolbox-run.1.md
index c65a15e41..4495d4d3d 100644
--- a/doc/toolbox-run.1.md
+++ b/doc/toolbox-run.1.md
@@ -63,7 +63,7 @@ failed to run or why it exited.
 $ toolbox run /etc; echo $?
 /bin/sh: line 1: /etc: Is a directory
 /bin/sh: line 1: exec: /etc: cannot execute: Is a directory
-Error: failed to invoke command /etc in container fedora-toolbox-35
+Error: failed to invoke command /etc in container fedora-toolbox-36
 126
 ```
 
@@ -72,7 +72,7 @@ Error: failed to invoke command /etc in container fedora-toolbox-35
 ```
 $ toolbox run foo; echo $?
 /bin/sh: line 1: exec: foo: not found
-Error: command foo not found in container fedora-toolbox-35
+Error: command foo not found in container fedora-toolbox-36
 127
 ```
 
diff --git a/doc/toolbox.1.md b/doc/toolbox.1.md
index c3635090c..d5658100d 100644
--- a/doc/toolbox.1.md
+++ b/doc/toolbox.1.md
@@ -57,7 +57,7 @@ specifies its version. Supported combinations are:
 
 Distro |Release
 -------|----------
-fedora |\<release\> or f\<release\> eg., 35 or f35
+fedora |\<release\> or f\<release\> eg., 36 or f36
 rhel   |\<major\>.\<minor\> eg., 8.5
 
 ## GLOBAL OPTIONS ##