diff --git a/Makefile b/Makefile
index 9c38279..f041de5 100644
--- a/Makefile
+++ b/Makefile
@@ -42,3 +42,6 @@ tag: clean
 	@echo "Creating git tag v$(tag)"
 	git tag v$(tag)
 	git push --tags
+
+runvm:
+	vagrant up vepcon
diff --git a/playbook.yml b/playbook.yml
index 928d798..8918157 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -6,5 +6,5 @@
   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: docker-compose, tags: docker_compose }
     - { role: chatbot, tags: chatbot }
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index e5cff5b..9adcb1b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,7 +1,5 @@
 ---
-# Common tasks
 
-# Prepare directories
 - name: prepare | Create directories
   file:
     path: '{{ item }}'
@@ -27,7 +25,6 @@
   with_items:
     - language-pack-en
     - build-essential
-    - libssl-dev
-    - python-dev
     - python3
+    - python3-dev
     - python3-pip
diff --git a/roles/docker-compose/tasks/install_docker_compose.yml b/roles/docker-compose/tasks/install_docker_compose.yml
index 84b4838..ad30aa0 100644
--- a/roles/docker-compose/tasks/install_docker_compose.yml
+++ b/roles/docker-compose/tasks/install_docker_compose.yml
@@ -10,20 +10,21 @@
     - libssl-dev
     - python-dev
     - python-pip
+  become: yes
+  become_method: sudo
 
-- name: Install docker-compose
+- name: Install pipsi
   pip:
     name: '{{ item }}'
     state: forcereinstall
   with_items:
-    - cryptography==2.3
-    - docker-compose==1.22.0
+    - pipsi
   executable: pip3
+  become: yes
+  become_method: sudo
 
-- name: docker-compose.yml template file
-  copy:
-    src: docker-compose.yml
-    dest: "{{ docker_compose_filepath }}"
-    owner: "{{ user }}"
-    group: "docker"
-    mode: 0640
+- name: Install docker-compose
+  command:
+    pipsi install docker-compose==1.22.0
+  args:
+    creates: "{{ home_dir }}/.local/bin/docker-compose"
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 188b40e..0f00c6e 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -1,13 +1,17 @@
 ---
 
-- include_tasks: install_docker.yml
+- import_tasks: install_docker.yml
+  become: yes
+  become_method: sudo
   tags: [docker, docker_compose]
 
-- include_tasks: install_docker_compose.yml
+- import_tasks: install_docker_compose.yml
   tags: [docker, docker_compose]
 
-- include_tasks: folders.yml
-  tags: [docker, docker_compose]
+- name: Update bashrc for pipsi scripts
+  lineinfile:
+    dest: "{{ home_dir }}/.bashrc"
+    line: "export PATH=$PATH:{{ home_dir }}/.local/bin"
 
 - name: Create folders for docker-compose
   file:
@@ -20,3 +24,11 @@
     - '{{ dockers_volumes_dir }}'
     - '{{ dockers_config_dir }}'
     - '{{ dockers_env_dir }}'
+
+- name: docker-compose.yml template file
+  copy:
+    src: docker-compose.yml
+    dest: "{{ docker_compose_filepath }}"
+    owner: "{{ user }}"
+    group: "docker"
+    mode: 0640