diff --git a/test/Vagrantfile b/test/Vagrantfile
index 84e6af0..3c1d12c 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -7,25 +7,49 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true
   config.vm.network "forwarded_port", guest: 80, host: 8080, auto_correct: true
 
-  config.vm.provider :virtualbox do |v|
-    v.memory = 1024
-    v.cpus = 1
-    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    v.customize ["modifyvm", :id, "--ioapic", "on"]
+  # config.vm.provider :virtualbox do |v|
+  #   v.memory = 1024
+  #   v.cpus = 1
+  #   v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+  #   v.customize ["modifyvm", :id, "--ioapic", "on"]
+  # end
+  config.vm.provider :libvirt do |libvirt|
+    # libvirt.storage :file, :size => '10G', :device => 'vdb'
+    libvirt.memory = 512
+    libvirt.cpus = 1
+  end
+
+  # Buster
+  config.vm.define :buster do |node|
+    node.vm.hostname = "buster"
+    node.vm.box = "debian/buster64"
+    node.vm.provision :ansible do |ansible|
+      ansible.limit = "buster"
+      ansible.playbook = "vagrant.yml"
+      # ansible.tags = "mysql"
+      ansible.raw_arguments = [
+        "-b",
+        "--ask-vault-pass",
+        # "--diff",
+        # "--step",
+        # "--syntax",
+        # "-vvv",
+      ]
+    end
   end
 
   # Stretch
   config.vm.define :stretch do |node|
     node.vm.hostname = "stretch"
     node.vm.box = "debian/stretch64"
-    node.vm.provision :ansible, run: "always" do |ansible|
+    node.vm.provision :ansible do |ansible|
       ansible.limit = "stretch"
       ansible.playbook = "vagrant.yml"
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
         "--ask-vault-pass",
-        "--diff",
+        # "--diff",
         # "--step",
         # "--syntax",
         # "-vvv",
@@ -37,14 +61,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define :jessie do |node|
     node.vm.hostname = "jessie"
     node.vm.box = "debian/jessie64"
-    node.vm.provision :ansible, run: "always" do |ansible|
+    node.vm.provision :ansible do |ansible|
       ansible.limit = "jessie"
       ansible.playbook = "vagrant.yml"
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
         "--ask-vault-pass",
-        "--diff",
+        # "--diff",
         # "--step",
         # "--syntax",
         # "-vvv",
@@ -52,4 +76,47 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
+
+  # # Stretch
+  # config.vm.define :mongo1 do |node|
+  #   node.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: false
+  #   node.vm.hostname = "mongo1"
+  #   node.vm.box = "debian/stretch64"
+  #   node.vm.provision :ansible do |ansible|
+  #     ansible.limit = "mongo1"
+  #     ansible.playbook = "vagrant-mongo.yml"
+  #     # ansible.tags = "mysql"
+  #     ansible.raw_arguments = [
+  #       "-b",
+  #       # "--ask-vault-pass",
+  #     ]
+  #   end
+  # end
+  # config.vm.define :mongo2 do |node|
+  #   node.vm.hostname = "mongo2"
+  #   node.vm.box = "debian/stretch64"
+  #   node.vm.provision :ansible do |ansible|
+  #     ansible.limit = "mongo2"
+  #     ansible.playbook = "vagrant-mongo.yml"
+  #     # ansible.tags = "mysql"
+  #     ansible.raw_arguments = [
+  #       "-b",
+  #       # "--ask-vault-pass",
+  #     ]
+  #   end
+  # end
+  # config.vm.define :mongo3 do |node|
+  #   node.vm.hostname = "mongo3"
+  #   node.vm.box = "debian/stretch64"
+  #   node.vm.provision :ansible do |ansible|
+  #     ansible.limit = "mongo3"
+  #     ansible.playbook = "vagrant-mongo.yml"
+  #     # ansible.tags = "mysql"
+  #     ansible.raw_arguments = [
+  #       "-b",
+  #       # "--ask-vault-pass",
+  #     ]
+  #   end
+  # end
+
 end
diff --git a/test/vagrant.yml b/test/vagrant.yml
index 6ccd1ef..8efa64a 100644
--- a/test/vagrant.yml
+++ b/test/vagrant.yml
@@ -4,23 +4,30 @@
   become: yes
 
   vars_files:
-  - '~/GIT/evolix-private/vars/evolinux-secrets.yml'
+    - '~/GIT/evolix-private/vars/evolinux-secrets.yml'
 
   vars:
+    evolinux_hostname: "vagrant-{{ inventory_hostname  }}"
+    evolinux_domain: "evolix.local"
+    # evolinux_fqdn: "{{ evolinux_hostname }}.{{ evolinux_domain }}"
+    # evolinux_internal_hostname: "vagrant-{{ inventory_hostname  }}-internal"
+    # evolinux_internal_domain: "evolix-internal.local"
+
     evolinux_apt_upgrade: False
     # evolinux_root_disable_ssh: False
 
+    evomaintenance_install_vendor: True
+    evomaintenance_alert_email: "evomaintenance-{{ evolinux_internal_hostname }}@evolix.fr"
+
     evolinux_ssh_allow_current_user: True
 
     minifirewall_additional_trusted_ips: ["192.168.0.0/16", "10.0.0.0/8"]
+    minifirewall_http_sites: ["0.0.0.0/0"]
 
     packweb_enable_evoadmin_vhost: True
+    evoadmin_contact_email: jlecour@evolix.fr
     packweb_phpmyadmin_suffix: "uE34swx9"
 
-    evolinux_hostname: "vagrant-{{ inventory_hostname  }}"
-    evolinux_domain: "evolix.local"
-    evolinux_fqdn: "{{ evolinux_hostname }}.{{ evolinux_domain }}"
-
     evolinux_apt_include: True
     evolinux_etcgit_include: True
     evolinux_hostname_include: True
@@ -45,24 +52,68 @@
     evolinux_fail2ban_include: False
     mysql_custom_datadir: '/home/mysql'
     mysql_custom_tmpdir: '/home/tmpmysql'
-
-
+    mysql_custom_logdir: '/home/mysql-logs'
+    # evolinux_apt_public_sources: False
+    apt_upgrade: True
+    lxc_containers:
+      - name: php56
+        release: jessie
+      - name: php70
+        release: stretch
+      - name: php73
+        release: buster
+  # tasks:
+  #   - debug:
+  #       var: "ansible_lsb.codename"
 
   roles:
+    # - aws-tuning
     - evolinux-base
-    - { role: squid, squid_localproxy_enable: True }
-    - apache
-    # - nginx
     - evolinux-users
-    # - mysql-oracle
-    - { role: packweb-apache, packweb_mysql_variant: "oracle" }
-    # - evoacme
-    - mongodb
+    # - { role: del-user, username: "gcolpart" }
+    # - metricbeat
+    # - { role: squid, squid_localproxy_enable: True }
+    # - apache
+    # - nginx
     # - mysql
-    - proftpd
-    - redis
+    # - mysql-oracle
+    # - percona
+    # - packweb-apache
+    # - { role: packweb-apache, packweb_mysql_variant: "oracle" }
+    # - { role: memcached, memcached_instance_name: "instance1" }
+    # - { role: memcached, memcached_instance_name: "instance2", memcached_port: 11212 }
+    # - { role: redis }
+    # - { role: redis, redis_instance_name: "instance1", redis_port: 6380 }
+    # - { role: redis, redis_instance_name: "instance2", redis_port: 6381 }
+    # - evoacme
+    # - etc-git
+    # - mongodb
+    # - mysql
+    # - proftpd
     # - supervisord
     # - evoacme
+    # - lxc
+    # - { role: lxc-php, lxc_php_version: "php56" }
+    # - { role: lxc-php, lxc_php_version: "php70" }
+    # - { role: lxc-php, lxc_php_version: "php73" }
+    # - evocheck
     # - tomcat
-    - redis
+    # - redis
     # - unbound
+    # - php
+    # - { role: postfix, postfix_packmail: True, postfix_force_main_cf: True }
+    # - apache
+    # - php
+    # - { role: webapps/evoadmin-mail }
+    # - { role: webapps/roundcube }
+
+  # post_tasks:
+  #   - include_role:
+  #       name: etc-git
+  #       tasks_from: commit.yml
+  #     vars:
+  #       commit_message: "Ansible post-run Evolinux playbook"
+  # 
+  #   - include_role:
+  #       name: evocheck
+  #       tasks_from: exec.yml