diff --git a/vagrant-env/Vagrantfile b/vagrant-env/Vagrantfile
index 08ed8cc7f63368360dc4007e9b95951f06af57a5..89ba1ff0a8cc9efc2628c5c22e64fbc6bb4d76a4 100644
--- a/vagrant-env/Vagrantfile
+++ b/vagrant-env/Vagrantfile
@@ -3,7 +3,7 @@ require 'yaml'
 
 Vagrant.configure("2") do |config|
   config.vm.define :kadeploy do |server|
-    server.vm.box = 'debian/contrib-jessie64'
+    server.vm.box = 'debian/contrib-buster64'
     server.vm.hostname = 'kadeploy'
     server.vm.synced_folder '.', '/vagrant'
     server.vm.synced_folder '..', '/kadeploy'
diff --git a/vagrant-env/kadeploy_provision.sh b/vagrant-env/kadeploy_provision.sh
index 3c29cb3588a4f5338402a07e509f13ed67d9291a..7c341ff28174e8f29f039a1f440a8613ce72eed6 100644
--- a/vagrant-env/kadeploy_provision.sh
+++ b/vagrant-env/kadeploy_provision.sh
@@ -6,13 +6,14 @@ wget http://packages.grid5000.fr/grid5000-archive-key.asc -q -O- | apt-key add -
 echo deb http://packages.grid5000.fr/deb/g5k-postinstall/ ./ > /etc/apt/sources.list.d/postinstall.list
 echo deb http://packages.grid5000.fr/deb/kadeploy-kernels/ ./ > /etc/apt/sources.list.d/kadeploykernel.list
 DEBIAN_FRONTEND=noninteractive apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get install -y ruby rubygems lsb-release git taktuk rake help2man mysql-server ruby-dev libmysqlclient-dev ident2 syslinux nmap dnsmasq isc-dhcp-server tftpd-hpa pxelinux
+DEBIAN_FRONTEND=noninteractive apt-get install -y ruby rubygems lsb-release git taktuk rake help2man mariadb-server libmariadbclient-dev ruby-dev ident2 syslinux ncat dnsmasq isc-dhcp-server tftpd-hpa pxelinux
 DEBIAN_FRONTEND=noninteractive apt-get install -y g5k-postinstall kadeploy3-deploy-kernel-buster
 # Not necessary:
 DEBIAN_FRONTEND=noninteractive apt-get install -y vim tcpdump
-gem install --conservative --no-ri --no-rdoc mysql
+gem install --conservative --no-ri --no-rdoc mysql2
 gem install --conservative --no-ri --no-rdoc net-ssh -v 4.2.0
-gem install --conservative --no-ri --no-rdoc net-ssh-multi
+gem install --conservative --no-ri --no-rdoc byebug -v 9.0.6
+gem install --conservative --no-ri --no-rdoc rspec
 }
 
 setup_tftp() {
@@ -42,7 +43,7 @@ systemctl restart dnsmasq
 }
 
 setup_kadeploy() {
-mysql <<< "DROP DATABASE IF EXISTS deploy3;\nCREATE DATABASE deploy3;\nGRANT select, insert, update, delete, create, drop, alter,  create temporary tables, lock tables ON deploy3.*  TO 'deploy'@'localhost';\nSET PASSWORD FOR  'deploy'@'localhost' = PASSWORD('deploy-password');\nuse deploy3;\nsource /vagrant/db_creation.sql;"
+mysql <<< "DROP DATABASE IF EXISTS deploy3;\nCREATE DATABASE deploy3;\nCREATE USER IF NOT EXISTS 'deploy'@'localhost';\nGRANT select, insert, update, delete, create, drop, alter, create temporary tables, lock tables ON deploy3.*  TO 'deploy'@'localhost';\nSET PASSWORD FOR  'deploy'@'localhost' = PASSWORD('deploy-password');\nuse deploy3;\nsource /vagrant/db_creation.sql;"
 cp /vagrant/keys/id_deploy /home/vagrant/.ssh/deploy_id_rsa
 chown vagrant /home/vagrant/.ssh/deploy_id_rsa
 chmod og-r /home/vagrant/.ssh/deploy_id_rsa