diff --git a/defaults/main.yml b/defaults/main.yml
index b6b322e..2332061 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,14 +1,23 @@
 ---
-# if you are interested in adding extra packages... do it here!
-packages_extra: []
+# install these additional packages
+base__extra_packages: []
 # - foo
 # - bar
 
+base__add_ethz: "{{ add_ethz }}"
+
+
+
+
+# LEGACY VARS
+# ++ WILL BE REMOVED SOON ++
+# add eth zurich apt source
+add_ethz: true
+
+
 # do we want the latest package version or just upgrade manually?
 upgrade_packages_to_latest_version: true
 
-# add eth zurich apt source
-add_ethz: true
 
 # we use vim!
 editor_is_vim: true
diff --git a/tasks/main.yml b/tasks/main.yml
index a216672..a33ef8f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,7 +6,9 @@
   when: submodules_versioncheck | bool
 
 - include_tasks: sources.yml
-  when: ansible_distribution == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
+    - base__add_ethz | bool
 
 - name: Install common base packages [Debian]
   become: yes
diff --git a/tasks/sources.yml b/tasks/sources.yml
index e80d049..cc1dc31 100644
--- a/tasks/sources.yml
+++ b/tasks/sources.yml
@@ -10,7 +10,6 @@
     update_cache: yes
     cache_valid_time: 43200
   when:
-    - ansible_distribution == 'Debian'
     - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
 
 - name: add eth zurich apt
@@ -25,18 +24,6 @@
     - ansible_distribution == 'Debian'
     - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
 
-- name: remove eth zurich apt
-  become: true
-  apt_repository:
-    repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
-    state: absent
-  when:
-    - not base_pkg_non_free_firmware | bool
-    - not base_pkg_contrib | bool
-    - not add_ethz | bool
-    - ansible_distribution == 'Debian'
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
-
 - name: add eth zurich apt
   become: true
   apt_repository: