diff --git a/Vagrantfile.libvirt b/Vagrantfile.libvirt
index 489eaf4..34cc022 100644
--- a/Vagrantfile.libvirt
+++ b/Vagrantfile.libvirt
@@ -7,12 +7,12 @@ Vagrant.configure("2") do |config|
       domain.cpus = 4
     end
   end
-  config.vm.define "ubuntu" do |ubuntu|
-    ubuntu.vm.box = "generic/ubuntu1804"
-    ubuntu.vm.synced_folder '.', '/vagrant', disabled: true
-    ubuntu.vm.provider :libvirt do |domain|
-      domain.memory = 4096
-      domain.cpus = 4
-    end
-  end
+#  config.vm.define "ubuntu" do |ubuntu|
+#    ubuntu.vm.box = "generic/ubuntu1804"
+#    ubuntu.vm.synced_folder '.', '/vagrant', disabled: true
+#    ubuntu.vm.provider :libvirt do |domain|
+#      domain.memory = 4096
+#      domain.cpus = 4
+#    end
+#  end
 end
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index baf2dbc..a798a83 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -34,189 +34,189 @@ git_repository_destination: /home/robertdb/Documents/github.com/robertdebock
 
 git_repositories:
   - repo: ssh://git@github.com/robertdebock/ansible-role-anaconda.git
-    dest: ansible-role-anaconda
+    dest: anaconda
   - repo: ssh://git@github.com/robertdebock/ansible-role-ansible.git
-    dest: ansible-role-ansible
+    dest: ansible
   - repo: ssh://git@github.com/robertdebock/ansible-role-ansible_lint.git
-    dest: ansible-role-ansible_lint
+    dest: ansible_lint
   - repo: ssh://git@github.com/robertdebock/ansible-role-apt_autostart.git
-    dest: ansible-role-apt_autostart
+    dest: apt_autostart
   - repo: ssh://git@github.com/robertdebock/ansible-role-ara.git
-    dest: ansible-role-ara
+    dest: ara
   - repo: ssh://git@github.com/robertdebock/ansible-role-artifactory.git
-    dest: ansible-role-artifactory
+    dest: artifactory
   - repo: ssh://git@github.com/robertdebock/ansible-role-at.git
-    dest: ansible-role-at
+    dest: at
   - repo: ssh://git@github.com/robertdebock/ansible-role-atom.git
-    dest: ansible-role-atom
+    dest: atom
   - repo: ssh://git@github.com/robertdebock/ansible-role-awx.git
-    dest: ansible-role-awx
+    dest: awx
   - repo: ssh://git@github.com/robertdebock/ansible-role-backup.git
-    dest: ansible-role-backup
+    dest: backup
   - repo: ssh://git@github.com/robertdebock/ansible-role-bootstrap.git
-    dest: ansible-role-bootstrap
+    dest: bootstrap
   - repo: ssh://git@github.com/robertdebock/ansible-role-buildtools.git
-    dest: ansible-role-buildtools
+    dest: buildtools
   - repo: ssh://git@github.com/robertdebock/ansible-role-ca.git
-    dest: ansible-role-ca
+    dest: ca
   - repo: ssh://git@github.com/robertdebock/ansible-role-cargo.git
-    dest: ansible-role-cargo
+    dest: cargo
   - repo: ssh://git@github.com/robertdebock/ansible-role-clamav.git
-    dest: ansible-role-clamav
+    dest: clamav
   - repo: ssh://git@github.com/robertdebock/ansible-role-cloud9.git
-    dest: ansible-role-cloud9
+    dest: cloud9
   - repo: ssh://git@github.com/robertdebock/ansible-role-cntlm.git
-    dest: ansible-role-cntlm
+    dest: cntlm
   - repo: ssh://git@github.com/robertdebock/ansible-role-common.git
-    dest: ansible-role-common
+    dest: common
   - repo: ssh://git@github.com/robertdebock/ansible-role-cve_2018_19788.git
-    dest: ansible-role-cve_2018_19788
+    dest: cve_2018_19788
   - repo: ssh://git@github.com/robertdebock/ansible-role-dhcpd.git
-    dest: ansible-role-dhcpd
+    dest: dhcpd
   - repo: ssh://git@github.com/robertdebock/ansible-role-digitalocean-agent.git
-    dest: ansible-role-digitalocean-agent
+    dest: digitalocean-agent
   - repo: ssh://git@github.com/robertdebock/ansible-role-dns.git
-    dest: ansible-role-dns
+    dest: dns
   - repo: ssh://git@github.com/robertdebock/ansible-role-docker.git
-    dest: ansible-role-docker
+    dest: docker
   - repo: ssh://git@github.com/robertdebock/ansible-role-docker_ce.git
-    dest: ansible-role-docker_ce
+    dest: docker_ce
   - repo: ssh://git@github.com/robertdebock/ansible-role-dovecot.git
-    dest: ansible-role-dovecot
+    dest: dovecot
   - repo: ssh://git@github.com/robertdebock/ansible-role-epel.git
-    dest: ansible-role-epel
+    dest: epel
   - repo: ssh://git@github.com/robertdebock/ansible-role-fail2ban.git
-    dest: ansible-role-fail2ban
+    dest: fail2ban
   - repo: ssh://git@github.com/robertdebock/ansible-role-firewall.git
-    dest: ansible-role-firewall
+    dest: firewall
   - repo: ssh://git@github.com/robertdebock/ansible-role-git.git
-    dest: ansible-role-git
+    dest: git
   - repo: ssh://git@github.com/robertdebock/ansible-role-glusterfs.git
-    dest: ansible-role-glusterfs
+    dest: glusterfs
   - repo: ssh://git@github.com/robertdebock/ansible-role-go.git
-    dest: ansible-role-go
+    dest: go
   - repo: ssh://git@github.com/robertdebock/ansible-role-gotop.git
-    dest: ansible-role-gotop
+    dest: gotop
   - repo: ssh://git@github.com/robertdebock/ansible-role-haproxy.git
-    dest: ansible-role-haproxy
+    dest: haproxy
   - repo: ssh://git@github.com/robertdebock/ansible-role-haveged.git
-    dest: ansible-role-haveged
+    dest: haveged
   - repo: ssh://git@github.com/robertdebock/ansible-role-httpd.git
-    dest: ansible-role-httpd
+    dest: httpd
   - repo: ssh://git@github.com/robertdebock/ansible-role-investigate.git
-    dest: ansible-role-investigate
+    dest: investigate
   - repo: ssh://git@github.com/robertdebock/ansible-role-irslackd.git
-    dest: ansible-role-irslackd
+    dest: irslackd
   - repo: ssh://git@github.com/robertdebock/ansible-role-java.git
-    dest: ansible-role-java
+    dest: java
   - repo: ssh://git@github.com/robertdebock/ansible-role-jenkins.git
-    dest: ansible-role-jenkins
+    dest: jenkins
   - repo: ssh://git@github.com/robertdebock/ansible-role-locale.git
-    dest: ansible-role-locale
+    dest: locale
   - repo: ssh://git@github.com/robertdebock/ansible-role-lynis.git
-    dest: ansible-role-lynis
+    dest: lynis
   - repo: ssh://git@github.com/robertdebock/ansible-role-mediawiki.git
-    dest: ansible-role-mediawiki
+    dest: mediawiki
   - repo: ssh://git@github.com/robertdebock/ansible-role-memcached.git
-    dest: ansible-role-memcached
+    dest: memcached
   - repo: ssh://git@github.com/robertdebock/ansible-role-mitogen.git
-    dest: ansible-role-mitogen
+    dest: mitogen
   - repo: ssh://git@github.com/robertdebock/ansible-role-molecule.git
-    dest: ansible-role-molecule
+    dest: molecule
   - repo: ssh://git@github.com/robertdebock/ansible-role-mssql.git
-    dest: ansible-role-mssql
+    dest: mssql
   - repo: ssh://git@github.com/robertdebock/ansible-role-mysql.git
-    dest: ansible-role-mysql
+    dest: mysql
   - repo: ssh://git@github.com/robertdebock/ansible-role-natrouter.git
-    dest: ansible-role-natrouter
+    dest: natrouter
   - repo: ssh://git@github.com/robertdebock/ansible-role-nginx.git
-    dest: ansible-role-nginx
+    dest: nginx
   - repo: ssh://git@github.com/robertdebock/ansible-role-npm.git
-    dest: ansible-role-npm
+    dest: npm
   - repo: ssh://git@github.com/robertdebock/ansible-role-ntp.git
-    dest: ansible-role-ntp
+    dest: ntp
   - repo: ssh://git@github.com/robertdebock/ansible-role-openssh.git
-    dest: ansible-role-openssh
+    dest: openssh
   - repo: ssh://git@github.com/robertdebock/ansible-role-openvas.git
-    dest: ansible-role-openvas
+    dest: openvas
   - repo: ssh://git@github.com/robertdebock/ansible-role-owncloud.git
-    dest: ansible-role-owncloud
+    dest: owncloud
   - repo: ssh://git@github.com/robertdebock/ansible-role-packer.git
-    dest: ansible-role-packer
+    dest: packer
   - repo: ssh://git@github.com/robertdebock/ansible-role-php.git
-    dest: ansible-role-php
+    dest: php
   - repo: ssh://git@github.com/robertdebock/ansible-role-php_fpm.git
-    dest: ansible-role-php_fpm
+    dest: php_fpm
   - repo: ssh://git@github.com/robertdebock/ansible-role-phpmyadmin.git
-    dest: ansible-role-phpmyadmin
+    dest: phpmyadmin
   - repo: ssh://git@github.com/robertdebock/ansible-role-postfix.git
-    dest: ansible-role-postfix
+    dest: postfix
   - repo: ssh://git@github.com/robertdebock/ansible-role-python-pip.git
-    dest: ansible-role-python_pip
+    dest: python_pip
   - repo: ssh://git@github.com/robertdebock/ansible-role-reboot.git
-    dest: ansible-role-reboot
+    dest: reboot
   - repo: ssh://git@github.com/robertdebock/ansible-role-redis.git
-    dest: ansible-role-redis
+    dest: redis
   - repo: ssh://git@github.com/robertdebock/ansible-role-release.git
-    dest: ansible-role-release
+    dest: release
   - repo: ssh://git@github.com/robertdebock/ansible-role-restore.git
-    dest: ansible-role-restore
+    dest: restore
   - repo: ssh://git@github.com/robertdebock/ansible-role-revealmd.git
-    dest: ansible-role-revealmd
+    dest: revealmd
   - repo: ssh://git@github.com/robertdebock/ansible-role-roundcubemail.git
-    dest: ansible-role-roundcubemail
+    dest: roundcubemail
   - repo: ssh://git@github.com/robertdebock/ansible-role-rsyslog.git
-    dest: ansible-role-rsyslog
+    dest: rsyslog
   - repo: ssh://git@github.com/robertdebock/ansible-role-ruby.git
-    dest: ansible-role-ruby
+    dest: ruby
   - repo: ssh://git@github.com/robertdebock/ansible-role-rundeck.git
-    dest: ansible-role-rundeck
+    dest: rundeck
   - repo: ssh://git@github.com/robertdebock/ansible-role-scl.git
-    dest: ansible-role-scl
+    dest: scl
   - repo: ssh://git@github.com/robertdebock/ansible-role-selinux.git
-    dest: ansible-role-selinux
+    dest: selinux
   - repo: ssh://git@github.com/robertdebock/ansible-role-skeleton.git
-    dest: ansible-role-skeleton
+    dest: skeleton
   - repo: ssh://git@github.com/robertdebock/ansible-role-snort.git
-    dest: ansible-role-snort
+    dest: snort
   - repo: ssh://git@github.com/robertdebock/ansible-role-spamassassin.git
-    dest: ansible-role-spamassassin
+    dest: spamassassin
   - repo: ssh://git@github.com/robertdebock/ansible-role-squid.git
-    dest: ansible-role-squid
+    dest: squid
   - repo: ssh://git@github.com/robertdebock/ansible-role-storage.git
-    dest: ansible-role-storage
+    dest: storage
   - repo: ssh://git@github.com/robertdebock/ansible-role-sudo-pair.git
-    dest: ansible-role-sudo_pair
+    dest: sudo_pair
   - repo: ssh://git@github.com/robertdebock/ansible-role-sysstat.git
-    dest: ansible-role-sysstat
+    dest: sysstat
   - repo: ssh://git@github.com/robertdebock/ansible-role-terraform.git
-    dest: ansible-role-terraform
+    dest: terraform
   - repo: ssh://git@github.com/robertdebock/ansible-role-tftpd.git
-    dest: ansible-role-tftpd
+    dest: tftpd
   - repo: ssh://git@github.com/robertdebock/ansible-role-tomcat.git
-    dest: ansible-role-tomcat
+    dest: tomcat
   - repo: ssh://git@github.com/robertdebock/ansible-role-travis.git
-    dest: ansible-role-travis
+    dest: travis
   - repo: ssh://git@github.com/robertdebock/ansible-role-update.git
-    dest: ansible-role-update
+    dest: update
   - repo: ssh://git@github.com/robertdebock/ansible-role-users.git
-    dest: ansible-role-users
+    dest: users
   - repo: ssh://git@github.com/robertdebock/ansible-role-vagrant.git
-    dest: ansible-role-vagrant
+    dest: vagrant
   - repo: ssh://git@github.com/robertdebock/ansible-role-xinetd.git
-    dest: ansible-role-xinetd
+    dest: xinetd
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix.git
-    dest: ansible-role-zabbix
+    dest: zabbix
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_agent.git
-    dest: ansible-role-zabbix_agent
+    dest: zabbix_agent
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_proxy.git
-    dest: ansible-role-zabbix_proxy
+    dest: zabbix_proxy
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_repository.git
-    dest: ansible-role-zabbix_repository
+    dest: zabbix_repository
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_server.git
-    dest: ansible-role-zabbix_server
+    dest: zabbix_server
   - repo: ssh://git@github.com/robertdebock/ansible-role-zabbix_web.git
-    dest: ansible-role-zabbix_web
+    dest: zabbix_web
   - repo: ssh://git@github.com/robertdebock/ansible-tools.git
     dest: ansible-tools
   - repo: ssh://git@github.com/robertdebock/ansible-tester.git