diff --git a/Vagrantfile b/Vagrantfile
index 93eeab0..0e9947f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,20 +1,16 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure("2") do |config|
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.define :test, :autostart => true do |node|
-    node.vm.box = 'ubuntu/trusty64'
-    node.vm.hostname = 'test'
-    node.vm.network :private_network, ip: "10.0.11.11", hostsupdater: "skip"
-    node.vm.provider "virtualbox" do |vb|
-      vb.memory = "1024"
-      vb.gui = false
-      vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
+  config.vm.define :vepcon, :autostart => true do |node|
+    node.vm.box = "ubuntu/trusty64"
+    node.vm.hostname = 'vepcon'
+    node.vm.network :private_network, ip: "10.0.11.10"
+    node.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+    node.vm.provision "ansible" do |ansible|
+      ansible.limit = "vepcon"
+      ansible.playbook = "playbook.yml"
     end
-    node.vm.provision :shell, path: "vagrant/test.sh", privileged: false
   end
-
 end
diff --git a/ansible.cfg b/ansible.cfg
index 6499fda..b4e5d37 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,9 +1,12 @@
 [defaults]
 
-inventory      = ./inventory
+inventory = hosts.yml
 remote_tmp = /tmp
 
-roles_path    = ./roles
+roles_path = ./roles
 host_key_checking = no
 vault_password_file = ./vault-pass.txt
 nocows = 1
+
+[ssh_connection]
+ssh_args= -o ControlMaster=auto -o ControlPersist=30m -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
diff --git a/host_vars/europython.yml b/host_vars/europython.yml
index 11d3c0b..78b7d71 100644
--- a/host_vars/europython.yml
+++ b/host_vars/europython.yml
@@ -6,13 +6,13 @@ group: "{{ ansible_ssh_user }}"
 home_dir: '/home/{{ user }}'
 
 tmp_install_dir: '{{ home_dir }}/tmp'
-install_dir:     '{{ home_dir }}/apps'
-bin_dir:         '{{ home_dir }}/bin'
+install_dir: '{{ home_dir }}/apps'
+bin_dir: '{{ home_dir }}/bin'
 
 config_dir_basename: "config"
 env_dir_basename: "envfile"
 
-dockers_files_dir:   '{{ install_dir }}/dockerfile'
+dockers_files_dir: '{{ install_dir }}/dockerfile'
 dockers_volumes_dir: '{{ install_dir }}/volume'
-dockers_config_dir:  '{{ install_dir }}/{{ config_dir_basename }}'
-dockers_env_dir:     '{{ install_dir }}/{{ env_dir_basename }}'
+dockers_config_dir: '{{ install_dir }}/{{ config_dir_basename }}'
+dockers_env_dir: '{{ install_dir }}/{{ env_dir_basename }}'
diff --git a/host_vars/vepcon.yml b/host_vars/vepcon.yml
new file mode 100644
index 0000000..aaab0ab
--- /dev/null
+++ b/host_vars/vepcon.yml
@@ -0,0 +1,18 @@
+---
+
+user: "{{ ansible_user }}"
+group: "{{ ansible_user }}"
+
+home_dir: '/home/{{ user }}'
+
+tmp_install_dir: '{{ home_dir }}/tmp'
+install_dir: '{{ home_dir }}/apps'
+bin_dir: '{{ home_dir }}/bin'
+
+config_dir_basename: "config"
+env_dir_basename: "envfile"
+
+dockers_files_dir: '{{ install_dir }}/dockerfile'
+dockers_volumes_dir: '{{ install_dir }}/volume'
+dockers_config_dir: '{{ install_dir }}/{{ config_dir_basename }}'
+dockers_env_dir: '{{ install_dir }}/{{ env_dir_basename }}'
diff --git a/hosts.yml b/hosts.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/hosts.yml
@@ -0,0 +1 @@
+---
diff --git a/inventory/prod/europython b/inventory/europython
similarity index 100%
rename from inventory/prod/europython
rename to inventory/europython
diff --git a/playbook.yml b/playbook.yml
new file mode 100644
index 0000000..928d798
--- /dev/null
+++ b/playbook.yml
@@ -0,0 +1,10 @@
+---
+
+- hosts:
+    - vepcon
+  any_errors_fatal: true
+  roles:
+    - { role: common, become: yes, become_method: sudo, tags: common }
+    - { role: python, become: yes, become_method: sudo, tags: python }
+    - { role: docker-compose, become: yes, become_method: sudo, tags: docker_compose }
+    - { role: chatbot, tags: chatbot }
diff --git a/site.yml b/site.yml
deleted file mode 100644
index ffa262a..0000000
--- a/site.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-- hosts: europython
-  any_errors_fatal: true
-  roles:
-    - { role: common, become: yes, become_method: sudo }
-    - { role: python, become: yes, become_method: sudo }
-    - { role: docker-compose, become: yes, become_method: sudo}
-    #- { role: chatbot, tags: chatbot }
-
-- hosts: test
-  any_errors_fatal: true
-  roles:
-    - { role: common, become: yes, become_method: sudo }
-    - { role: python, become: yes, become_method: sudo }
-    - { role: docker-compose, become: yes, become_method: sudo, tags: docker_compose }
-    - { role: chatbot, tags: chatbot }
-
-- hosts: manager
-  any_errors_fatal: true
-  roles:
-    - { role: manager, become: yes, become_method: sudo, tags: manager }
-    - { role: ssh, become: yes, become_method: sudo, tags: ssh }
-    - { role: fish, become: yes, become_method: sudo, tags: fish }