diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 38097e6f..6ac368fe 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -79,7 +79,8 @@ evolinux_system_include: True
 evolinux_system_chmod_tmp: True
 evolinux_system_locales: True
 evolinux_system_timezone: "Europe/Paris"
-evolinux_system_vim_default: True
+evolinux_system_vim_skip_defaults: true
+evolinux_system_vim_default_editor: True
 evolinux_system_profile: True
 evolinux_system_dirmode_adduser: True
 evolinux_system_restrict_securetty: False
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index 899aebb8..28f0c82d 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -43,11 +43,18 @@
 
 - include: remount_usr_rw.yml
 
+- name: Ensure automagic vim conf is disabled
+  lineinfile:
+    dest: /etc/vim/vimrc
+    regexp: 'let g:skip_defaults_vim ='
+    line: 'let g:skip_defaults_vim = 1'
+  when: evolinux_system_vim_skip_defaults
+
 - name: Setting vim as default editor
   alternatives:
     name: editor
     path: /usr/bin/vim.basic
-  when: evolinux_system_vim_default
+  when: evolinux_system_vim_default_editor
 
 - name: Add "umask 027" to /etc/profile.d/evolinux.sh
   lineinfile: