diff --git a/defaults/main.yml b/defaults/main.yml
index 8f638888a73574ffb4524407749ed1a359d011a2..08bd2ab01776841d1ee76e14cd0f4724a8567c5f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,3 +19,5 @@ sd_groups:
 sd_repo_public_key_uri: 'https://archive.serverdensity.com/sd-packaging-public.key'
 sd_agent_plugins_dir: '/usr/share/python/sd-agent/checks.d/plugins'
 sd_plugins_files_dir: "{{ playbook_dir }}/files/sd-plugins"
+
+sd_uninstallv1: no
diff --git a/tasks/main.yml b/tasks/main.yml
index af3af51ef07786b6f7d1e5b486e56564b2362d34..8e96290b63e9c4ced893c42796db1771b0fbf5ff 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,8 @@
 ---
 # file: roles/serverdensity/tasks/main.yml
 
-- name: "ServerDensity | Check for old version 1"
-  shell: ls /etc/sd-agent/conf.d/disk.yaml.default
-  register: sd_v2_available
-  ignore_errors: yes
-  changed_when: False
-
 - include: uninstallv1.yml
-  when: sd_v2_available.stdout != '/etc/sd-agent/conf.d/disk.yaml.default'
+  when: sd_uninstallv1
 
 - name: "ServerDensity | Init SD plugin"
   local_action: