diff --git a/tasks/main.yml b/tasks/main.yml
index cce1ace..8c74c0a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,9 +7,9 @@
 
 - include_tasks: sources.yml
   when:
-    - ansible_os_family == 'Debian'
     - base__add_ethz | bool
     - ansible_architecture == 'x86_64'
+    - ansible_distribution == 'Debian' and ansible_distribution_version | float >= 8
 
 - include_tasks: packages.yml
 
diff --git a/tasks/sources.yml b/tasks/sources.yml
index 36498b3..55a5f1a 100644
--- a/tasks/sources.yml
+++ b/tasks/sources.yml
@@ -7,8 +7,6 @@
       - apt-dater-host
       - apt-transport-https
     state: present
-  when:
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
 
 - name: add eth zurich apt (main)
   become: true
@@ -19,7 +17,6 @@
   when:
     - not base__pkg_non_free_firmware | bool
     - not base__pkg_contrib | bool
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
 
 - name: add eth zurich apt (main non-free)
   become: true
@@ -30,7 +27,6 @@
   when:
     - base__pkg_non_free_firmware | bool
     - not base__pkg_contrib | bool
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
 
 - name: add eth zurich apt (main contrib non-free)
   become: true
@@ -41,4 +37,3 @@
   when:
     - base__pkg_non_free_firmware | bool
     - base__pkg_contrib | bool
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
diff --git a/vars/main.yml b/vars/main.yml
index 57aad0f..cc4ddf1 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -54,5 +54,5 @@ base__linux_packages:
   - youtube-dl
   - mpv
 
-playbook_version_number: 8999 # should be over ninethousand
+playbook_version_number: 9000 # should be over ninethousand
 playbook_version_path: 'base-packages_roles-ansible_github.version'