diff --git a/Vagrantfile b/Vagrantfile
index 43602f9..d3ebd3d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,279 +1,277 @@
 Vagrant.require_version ">= 2.2.0"
 ENV["LC_ALL"] = "en_US.UTF-8"
 
 # Default configuration for all defines node below
 environment = "staging"
 environment_path = "/tmp/puppet/environments"
 manifest_file = "site.pp"
 manifests_path = "swh-site/manifests"
 puppet_options = "--fileserverconfig=/etc/puppet/fileserver.conf --verbose"  # --debug --trace for more
 puppet_default_facts = {
   "vagrant_testing" => "1",
   "testing" => "vagrant",
   "deployment" => "staging",
   "subnet" => "vagrant"
 }
 # used to define the local vm template path
 puppet_env_path=ENV["SWH_PUPPET_ENVIRONMENT_HOME"]
 
 # Images/local configuration
 # vbox
 $local_debian10_box = "debian10-20201006-0832"
 $local_debian10_box_url = "file://#{puppet_env_path}/packer/builds/swh-debian-10.6-amd64-20201006-0832.box"
 # libvirt
-$local_debian10_qcow2 = "debian10-20201010-1039"
-$local_debian10_qcow2_url = "file://#{puppet_env_path}/packer/builds/swh-debian-10.6-amd64-20201010-1039.qcow2"
+$local_debian10_qcow2 = "debian10-20201012-1352"
+$local_debian10_qcow2_url = "file://#{puppet_env_path}/packer/builds/swh-debian-10.6-amd64-20201012-1352.qcow2"
 
 # Images/remote configuration
 # vbox
 $global_debian10_box = "debian10-20201006-0832"
 $global_debian10_box_url = "https://annex.softwareheritage.org/public/isos/virtualbox/debian/swh-debian-10.6-amd64-20201006-0832.box"
 # libvirt
-$global_debian10_qcow2 = "debian10-20201010-1039"
-$global_debian10_qcow2_url = "https://annex.softwareheritage.org/public/isos/libvirt/debian/swh-debian-10.6-amd64-20201010-1039.qcow2"
+$global_debian10_qcow2 = "debian10-20201012-1352"
+$global_debian10_qcow2_url = "https://annex.softwareheritage.org/public/isos/libvirt/debian/swh-debian-10.6-amd64-20201012-1352.qcow2"
 
 Vagrant.configure("2") do |global_config|
   ################
   ## STAGING
   ################
   global_config.vm.define :"staging-webapp" do |config|
 
     # config.ssh.insert_key = false
 
     config.vm.box                     = $global_debian10_box
     config.vm.box_url                 = $global_debian10_box_url
     config.vm.box_check_update        = false
     config.vm.hostname                = "webapp.internal.staging.swh.network"
     config.vm.network   :private_network, ip: "10.168.128.8", netmask: "255.255.255.0"
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider  "virtualbox" do |vb|
       vb.name = "staging-webapp"
       vb.gui = false
       vb.check_guest_additions = false
       vb.linked_clone = true
       vb.memory = 512
       vb.cpus = 2
     end
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   global_config.vm.define :"staging-deposit" do |config|
-    config.vm.box                     = $global_debian10_box
-    config.vm.box_url                 = $global_debian10_box_url
+    config.vm.box                     = $global_debian10_qcow2
+    config.vm.box_url                 = $global_debian10_qcow2_url
     config.vm.box_check_update        = false
     config.vm.hostname                = "deposit.internal.staging.swh.network"
     config.vm.network   :private_network, ip: "10.168.128.9", netmask: "255.255.255.0"
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
 
-    config.vm.provider  "virtualbox" do |vb|
-      vb.name = "staging-deposit"
-      vb.gui = false
-      vb.check_guest_additions = false
-      vb.linked_clone = true
-      vb.memory = 512
-      vb.cpus = 2
+    config.vm.provider :libvirt do |provider|
+      provider.memory = 512
+      provider.cpus = 2
+      # local test run: https://github.com/vagrant-libvirt/vagrant-libvirt/issues/45
+      provider.driver = 'kvm'
     end
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   global_config.vm.define :"staging-worker0" do |config|
 
     config.vm.box                     = $global_debian10_box
     config.vm.box_url                 = $global_debian10_box_url
     config.vm.hostname                = "worker0.staging.swh.network"
     config.vm.network   :private_network, ip: "10.168.128.5", netmask: "255.255.255.0"
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider  "virtualbox" do |vb|
       vb.name = "staging-worker0"
       vb.gui = false
       vb.check_guest_additions = false
       vb.linked_clone = true
       vb.memory = 4096
       vb.cpus = 2
     end
 
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   ################
   # ADMIN
   ################
   global_config.vm.define :"bojimans" do |config|
 
     # config.ssh.insert_key = false
 
     config.vm.box                     = $global_debian10_box
     config.vm.box_url                 = $global_debian10_box_url
     config.vm.box_check_update        = false
     config.vm.hostname                = "bojimans.internal.softwareheritage.org"
     config.vm.network   :private_network, ip: "10.168.100.199", netmask: "255.255.255.0"
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider  "virtualbox" do |vb|
       vb.name = "bojimans"
       vb.gui = false
       vb.check_guest_additions = false
       vb.linked_clone = true
       vb.memory = 512
       vb.cpus = 2
     end
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   ################
   ## PRODUCTION
   ################
   global_config.vm.define :"prod-worker01" do |config|
 
     config.vm.box                     = $global_debian10_box
     config.vm.box_url                 = $global_debian10_box_url
     config.vm.hostname                = "worker01.softwareheritage.org"
     config.vm.network   :private_network, ip: "10.168.100.21", netmask: "255.255.255.0"
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider  "virtualbox" do |vb|
       vb.name = "worker01"
       vb.gui = false
       vb.check_guest_additions = false
       vb.linked_clone = true
       vb.memory = 4096
       vb.cpus = 2
     end
 
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   ################
   ## MISC
   ################
   global_config.vm.define :test do |config|
 
     config.ssh.insert_key = false
 
     config.vm.box                     = $global_debian10_box
     config.vm.box_url                 = $global_debian10_box_url
     config.vm.box_check_update = false
     config.vm.hostname                = "test.softwareheritage.org"
     config.vm.network   :private_network, ip: "10.168.100.30", netmask: "255.255.255.0"
     config.vm.network   :private_network, ip: "10.168.101.30", netmask: "255.255.255.0"
     config.vm.network "forwarded_port", guest: 10030, host: 22
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider  "virtualbox" do |vb|
       vb.name = "test"
       vb.gui = false
       vb.check_guest_additions = false
       vb.linked_clone = true
       vb.memory = 512
       vb.cpus = 2
     end
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 
   unless Vagrant.has_plugin?("libvirt")
     $stderr.puts <<-MSG
     vagrant-libvirt plugin is required for this.
     To install: `$ sudo apt install vagrant-libvirt
 MSG
     exit 1
   end
 
   global_config.vm.define :qemutest do |config|
     config.ssh.insert_key = false
 
-    config.vm.box                     = $local_debian10_qcow2
-    config.vm.box_url                 = $local_debian10_qcow2_url
+    config.vm.box                     = $global_debian10_qcow2
+    config.vm.box_url                 = $global_debian10_qcow2_url
     config.vm.hostname                = "test.softwareheritage.org"
     config.vm.box_check_update        = false
     config.vm.network   :private_network, ip: "10.168.98.30", netmask: "255.255.255.0"
     config.vm.network   :private_network, ip: "10.168.99.30", netmask: "255.255.255.0"
     config.vm.network "forwarded_port", guest: 10030, host: 22
 
     config.vm.synced_folder "/tmp/puppet/", "/tmp/puppet", type: 'nfs'
     # ssl certificates share
     config.vm.synced_folder "vagrant/le_certs", "/etc/puppet/le_certs", type: 'nfs'
 
     config.vm.provider :libvirt do |provider|
       provider.memory = 512
       provider.cpus = 2
       # local test run: https://github.com/vagrant-libvirt/vagrant-libvirt/issues/45
       provider.driver = 'kvm'
     end
 
     config.vm.provision "puppet" do |puppet|
       puppet.environment_path = "#{environment_path}"
       puppet.environment = "#{environment}"
       puppet.hiera_config_path = "#{puppet.environment_path}/#{puppet.environment}/hiera.yaml"
       puppet.manifest_file = "#{manifest_file}"
       puppet.manifests_path = "#{manifests_path}"
       puppet.options = "#{puppet_options}"
       puppet.facter = puppet_default_facts
     end
   end
 end
diff --git a/packer/debian_buster.qemu.json b/packer/debian_buster.qemu.json
index a57a1f7..48e3050 100644
--- a/packer/debian_buster.qemu.json
+++ b/packer/debian_buster.qemu.json
@@ -1,72 +1,72 @@
 {
   "variables": {
-    "DISK_SIZE": "5120",
+    "DISK_SIZE": "20480",
     "IMAGE_TIMESTAMP": "{{isotime \"20060102-1504\"}}",
     "PACKER_BOX_NAME": "swh-debian-10.6-amd64-{{ user `IMAGE_TIMESTAMP` }}"
   },
   "builders": [
     {
       "headless": false,
       "type": "qemu",
       "format": "qcow2",
       "accelerator": "kvm",
       "net_device": "virtio-net",
       "disk_interface": "virtio",
       "memory": 2048,
       "cpus": 2,
 
       "boot_command": [
         "<esc><wait>",
         "install <wait>",
         "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/buster-preseed.cfg <wait>",
         "debian-installer=en_US.UTF-8 <wait>",
         "auto <wait>",
         "locale=en_US.UTF-8 <wait>",
         "kbd-chooser/method=us <wait>",
         "keyboard-configuration/xkb-keymap=us <wait>",
         "netcfg/get_hostname={{ .Name }} <wait>",
         "netcfg/get_domain=vagrantup.com <wait>",
         "fb=false <wait>",
         "debconf/frontend=noninteractive <wait>",
         "console-setup/ask_detect=false <wait>",
         "console-keymaps-at/keymap=us <wait>",
         "grub-installer/bootdev=/dev/vda <wait>",
         "<enter><wait>"
       ],
 
       "boot_wait": "5s",
       "disk_size": "{{ user `DISK_SIZE` }}",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "1000s",
       "output_directory": "output",
       "http_directory": "http",
       "iso_urls": [
         "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.6.0-amd64-netinst.iso"
       ],
       "iso_checksum": "2af8f43d4a7ab852151a7f630ba596572213e17d3579400b5648eba4cc974ed0",
       "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",
       "vm_name": "{{ user `PACKER_BOX_NAME` }}"
     }],
   "provisioners": [
     {
       "type": "shell",
       "expect_disconnect": "true",
       "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/post-install.sh"
       ]
     }
   ],
 
   "post-processors": [
     [
       {
         "type": "vagrant",
         "compression_level": 9,
         "output": "builds/{{ user `PACKER_BOX_NAME` }}.qcow2"
       }
     ]
   ]
 }