diff --git a/tasks/main.yml b/tasks/main.yml
index 5200013..9431a72 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,14 +17,14 @@
     cache_valid_time: 43200
   when:
     - ansible_os_family == 'Debian'
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: Install common base packages [all]
   become: yes
   package:
     name: "{{ base_packages }}"
     state: present
-  when: ansible_machine != 'armv6l'
+  when: ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: Install common base packages [Fedora]
   become: yes
@@ -43,7 +43,7 @@
     - ansible_distribution_version != "14.04"
     - ansible_distribution_version != "12.04"
     - ansible_distribution_release != 'wheezy'
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: Install extra packages
   become: true
@@ -53,7 +53,7 @@
   when:
     - packages_extra is defined
     - packages_extra != '[]'
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: Remove rpcbind, nfs-common
   become: yes
@@ -62,7 +62,7 @@
       - rpcbind
       - nfs-common
     state: absent
-  when: ansible_machine != 'armv6l'
+  when: ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: Upgrade all packages to latest
   become: true
@@ -71,6 +71,7 @@
     state: latest
   when:
     - upgrade_packages_to_latest_version|bool
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - include_tasks: editor.yml
   when: editor_is_vim | bool
diff --git a/tasks/sources.yml b/tasks/sources.yml
index c14b1b4..6f8327e 100644
--- a/tasks/sources.yml
+++ b/tasks/sources.yml
@@ -11,7 +11,8 @@
     cache_valid_time: 43200
   when:
     - ansible_distribution == 'Debian'
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
+
 
 - name: add eth zurich apt
   become: true
@@ -21,8 +22,7 @@
   when:
     - add_ethz | bool
     - ansible_distribution == 'Debian'
-    - ansible_distribution_release == "wheezy" or ansible_distribution_release == "buster"
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8
 
 - name: remove eth zurich apt
   become: true
@@ -32,4 +32,4 @@
   when:
     - not add_ethz | bool
     - ansible_distribution == 'Debian'
-    - ansible_machine != 'armv6l'
+    - ansible_machine != 'armv6l' and ansible_distribution_version < 8