diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile
index a5628cb65..f949404b7 100644
--- a/scripts/vagrant/Vagrantfile
+++ b/scripts/vagrant/Vagrantfile
@@ -17,6 +17,7 @@ def get_box_type(distro, force_distro)
     'fedora33'   => 'generic/fedora33',
     'fedora34'   => 'generic/fedora34',
     'fedora35'   => 'generic/fedora35',
+    'fedora36'   => 'generic/fedora36',
     'arch'       => 'generic/arch',
     'freebsd12'  => 'generic/freebsd12',
     'rocky8'     => 'rockylinux/8'
diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh
index 242bed981..77a2029d5 100755
--- a/scripts/vagrant/create_vbox.sh
+++ b/scripts/vagrant/create_vbox.sh
@@ -20,7 +20,7 @@ display_help() {
 	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcufaoH] <distro>"
 	echo
 	echo "  distro = <centos7 | centos8 | ubuntu1604 | ubuntu1804 | ubuntu2004 | ubuntu2204 | fedora33 |"
-	echo "            fedora34 | fedora35 | freebsd11 | freebsd12 | arch | clearlinux | rocky8>"
+	echo "            fedora34 | fedora35 | fedora36 | freebsd11 | freebsd12 | arch | clearlinux | rocky8>"
 	echo
 	echo "  -s <ram-size> in MB             Default: ${SPDK_VAGRANT_VMRAM}"
 	echo "  -n <num-cpus> 1 to 4            Default: ${SPDK_VAGRANT_VMCPU}"