diff --git a/.cirrus.yml b/.cirrus.yml
index b1a5aaf6b..677855289 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,7 +23,7 @@ task:
     # By default, Cirrus CI doesn't have HOME defined
     HOME: /root
     matrix:
-      BOX: fedora/35-cloud-base
+      BOX: fedora/36-cloud-base
       BOX: rockylinux/8
   install_libvirt_vagrant_script: |
     apt-get update
diff --git a/Vagrantfile b/Vagrantfile
index 6b6bcb0cb..2221f63b2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,7 @@
 
 # Vagrantfile for Fedora and EL
 Vagrant.configure("2") do |config|
-  config.vm.box = ENV["BOX"] || "fedora/35-cloud-base"
+  config.vm.box = ENV["BOX"] || "fedora/36-cloud-base"
   config.vm.box_version = ENV["BOX_VERSION"]
 
   memory = 4096