diff --git a/.gitignore b/.gitignore
index e424974..3a13502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .vagrant
 keys
+.idea
+*.iml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 834bf61..d17dfc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive
 
 
 COPY change_user_uid.sh /
-COPY inventory_file  /etc/ansible/hosts
 
 # Note: we chain all the command in One RUN, so that docker create only one layer
 RUN \
diff --git a/inventory_file b/inventory_file
deleted file mode 100644
index 8bb7ba6..0000000
--- a/inventory_file
+++ /dev/null
@@ -1,2 +0,0 @@
-[local]
-localhost
diff --git a/provisioning/roles/vim/tasks/main.yml b/provisioning/roles/vim/tasks/main.yml
index 57ae186..e19b4dd 100644
--- a/provisioning/roles/vim/tasks/main.yml
+++ b/provisioning/roles/vim/tasks/main.yml
@@ -1,67 +1,72 @@
 ---
-- name: copy config files in rc folder
-  copy: src=.vimrc dest={{ home }}/.vimrc
 
-- name: Create ~/.vim folder
-  file: dest={{ home }}/.vim state=directory
+- name: copy config files in rc folder
+  copy:
+    src=".vimrc"
+    dest="{{ home }}/.vimrc"
+    owner="{{ username }}"
+    group="{{ username }}"
+    mode=0640
 
-- name: Create ~/src folder
-  file: dest={{ home }}/src/vim-pathogen state=directory
+- name: Create dot-vim folders
+  file:
+    dest="{{ item }}"
+    state=directory
+    owner="{{ username }}"
+    group="{{ username }}"
+    mode=0750
+  with_items:
+    - "{{ home }}/.vim"
+    - "{{ home }}/.vim/autoload"
+    - "{{ home }}/.vim/bundle"
+    - "{{ home }}/src"
 
 - name: Check out pathogen
   git:
-      repo=https://github.com/tpope/vim-pathogen.git
-      dest={{ home }}/src/vim-pathogen
-      update=yes
-
-- name: Create ~/.vim/autoload folder
-  file: dest={{ home }}/.vim/autoload state=directory
+    repo="https://github.com/tpope/vim-pathogen.git"
+    dest="{{ home }}/src/vim-pathogen"
+    update=yes
 
 - name: Symlink pathogen into ~/.vim/autoload
   file:
-      src={{ home }}/src/vim-pathogen/autoload/pathogen.vim
-      dest={{ home }}/.vim/autoload/pathogen.vim
-      state=link
-#
+    src="{{ home }}/src/vim-pathogen/autoload/pathogen.vim"
+    dest="{{ home }}/.vim/autoload/pathogen.vim"
+    state=link
 
-- name: Ensure ~/.vim/bundle exists
-  file:
-    dest={{ home }}/.vim/bundle
-    state=directory
 - name: Check out syntastic
   git:
-    repo=https://github.com/scrooloose/syntastic.git
-    dest={{ home }}/.vim/bundle/syntastic
+    repo="https://github.com/scrooloose/syntastic.git"
+    dest="{{ home }}/.vim/bundle/syntastic"
     update=yes
 
-#
 - name: Checkout abolish
   git:
-    repo=https://github.com/tpope/vim-abolish.git
-    dest={{ home }}/.vim/bundle/vim-abolish
+    repo="https://github.com/tpope/vim-abolish.git"
+    dest="{{ home }}/.vim/bundle/vim-abolish"
     update=yes
 
-#
-
 - name: Install apt packages for YouCompleteMe vim completion engine
-  sudo: yes
   apt:
-    name={{ item }} state=latest
+    name="{{ item }}"
+    state=present
   with_items:
     - build-essential
     - cmake
     - python-dev
+
 - name: Check out YouCompleteMe
   git:
-    repo=https://github.com/Valloric/YouCompleteMe.git
-    dest={{ home }}/src/YouCompleteMe
+    repo="https://github.com/Valloric/YouCompleteMe.git"
+    dest="{{ home }}/src/YouCompleteMe"
     force=yes
+
 - name: Symlink YouCompleteMe to ~/vim/bundle
   file:
-    src={{ home }}/src/YouCompleteMe
-    dest={{ home }}/.vim/bundle/YouCompleteMe
+    src="{{ home }}/src/YouCompleteMe"
+    dest="{{ home }}/.vim/bundle/YouCompleteMe"
     state=link
+
 - name: Compile YouCompleteMe binaries
   command: ./install.sh --clang-completer
-    chdir={{ home }}/src/YouCompleteMe
-    creates={{ home }}/src/YouCompleteMe/third_party/ycmd/ycm_core.so
+    chdir="{{ home }}/src/YouCompleteMe"
+    creates="{{ home }}/src/YouCompleteMe/third_party/ycmd/ycm_core.so"
diff --git a/provisioning/roles/zsh/tasks/main.yml b/provisioning/roles/zsh/tasks/main.yml
index 7b1fac6..80cbdc0 100644
--- a/provisioning/roles/zsh/tasks/main.yml
+++ b/provisioning/roles/zsh/tasks/main.yml
@@ -1,11 +1,19 @@
 ---
+
 - name: install zsh from repo
-  sudo: yes
-  apt: name=zsh state=installed
+  apt: 
+    name=zsh
+    state=present
 
 - name: copy config files in rc folder
-  copy: src=.zshrc dest={{ home }}/.zshrc
+  copy: 
+    src=".zshrc"
+    dest="{{ home }}/.zshrc"
+    owner="{{ username }}"
+    group="{{ username }}"
+    mode=0640
 
 - name: change login shell to zsh
-  sudo: yes
-  user: name=vagrant shell=/usr/bin/zsh 
+  user:
+    name="{{ username }}" 
+    shell=/usr/bin/zsh 
diff --git a/provisioning/site.yml b/provisioning/site.yml
index 8b9651c..17c3643 100644
--- a/provisioning/site.yml
+++ b/provisioning/site.yml
@@ -1,14 +1,19 @@
 ---
-- hosts: all
-  sudo: true
+- hosts: localhost
+  become: true
+
   vars:
-      home: /home/vagrant
-      document_root: /vagrant
+    username: "vagrant"
+    home: "/home/{{ username }}"
+    document_root: "/{{ username }}"
+
   pre_tasks:
-    - name: check last APT update time
-      apt: update_cache=yes cache_valid_time=86400
     - name: Install stuff from Aptitude
-      apt: name={{ item }} state=installed
+      apt: 
+        name="{{ item }}"
+        state=present
+        update_cache=yes 
+        cache_valid_time=86400
       with_items:
        - git
        - tig
@@ -25,5 +30,5 @@
        - libffi-dev
 
   roles:
-    - {role: zsh, sudo: false}
-    - {role: vim, sudo: false}
+    - zsh
+    - vim