diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora
index 511e9692e..7d35e3861 100644
--- a/Vagrantfile.fedora
+++ b/Vagrantfile.fedora
@@ -3,7 +3,7 @@
 
 Vagrant.configure("2") do |config|
 # Fedora box is used for testing cgroup v2 support
-  config.vm.box = "fedora/35-cloud-base"
+  config.vm.box = "fedora/36-cloud-base"
   config.vm.provider :virtualbox do |v|
     v.memory = 2048
     v.cpus = 2
@@ -23,7 +23,7 @@ Vagrant.configure("2") do |config|
       cat << EOF | dnf -y --exclude=kernel,kernel-core shell && break
 config install_weak_deps false
 update
-install iptables gcc make glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs
+install iptables gcc golang-go make glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs
 ts run
 EOF
     done
@@ -32,11 +32,6 @@ EOF
     # Prevent the "fatal: unsafe repository" git complain during build.
     git config --global --add safe.directory /vagrant
 
-    # Install golang.
-    # FIXME go back to golang-go rpm once switched to Fedora 36.
-    curl -fsSL https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar Cxz /usr/local
-    echo 'export PATH=/usr/local/go/bin:$PATH' >> /etc/profile.d/golang.sh
-
     # Add a user for rootless tests
     useradd -u2000 -m -d/home/rootless -s/bin/bash rootless