diff --git a/defaults/main.yml b/defaults/main.yml
index ed62eff..41ec428 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -148,7 +148,6 @@ sahara_service_in_ldap: False
 # Sahara packages that must be installed before anything else
 sahara_requires_pip_packages:
   - virtualenv
-  - virtualenv-tools
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - httplib2
 
diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml
index fe2bc47..5e8c941 100644
--- a/tasks/sahara_install.yml
+++ b/tasks/sahara_install.yml
@@ -111,9 +111,12 @@
     - sahara_get_venv | changed
 
 - name: Update virtualenv path
-  command: >
-    virtualenv-tools --update-path=auto --reinitialize {{ sahara_bin | dirname }}
+  shell: |
+    find {{ sahara_bin }} -name \*.pyc -delete
+    sed -si '1s/^.*python.*$/#!{{ sahara_bin | replace ('/','\/') }}\/python/' {{ sahara_bin }}/*
   when: sahara_get_venv | changed
+  tags:
+    - skip_ansible_lint
 
 - name: Record the venv tag deployed
   ini_file: