diff --git a/kerberox-client.yml b/kerberox-client.yml
index 4861857..3170e0e 100644
--- a/kerberox-client.yml
+++ b/kerberox-client.yml
@@ -6,7 +6,6 @@
   remote_user: ansible
   become: yes
   vars:
-    deb_release: "buster"
     extra_pkgs:
       - webext-privacy-badger
       - webext-ublock-origin
diff --git a/kerberox.yml b/kerberox.yml
index e7eff0e..1c34282 100644
--- a/kerberox.yml
+++ b/kerberox.yml
@@ -17,8 +17,8 @@
     dhcp_list: "{{ lookup('sequence', 'start=50 end=150 format=192.168.0.%d', wantlist=True) }}"
     tftp_root: "/var/lib/tftpboot"
     deb_mirror: "deb.debian.org"
-    di_dist: "buster"
-    di_version: "10"
+    di_dist: "{{ ansible_distribution_release }}"
+    di_version: "{{ ansible_distribution_version }}"
     di_pkg: "debian-installer-{{ di_version }}-netboot-amd64"
     ansible_user: ansible
     repo_dir: "/home/{{ ansible_user }}/debian-lan"
diff --git a/kiosk.yml b/kiosk.yml
index e3e89a5..b68bbb7 100644
--- a/kiosk.yml
+++ b/kiosk.yml
@@ -6,7 +6,6 @@
   remote_user: ansible
   become: yes
   vars:
-    deb_release: "buster"
     auto_user: debi
     wifi_ssid: "YOUR SSID HERE"
     wifi_passwd: "YOUR WIFI-PW HERE"
diff --git a/roles/kiosk/tasks/main.yml b/roles/kiosk/tasks/main.yml
index ae75af1..93aaea8 100644
--- a/roles/kiosk/tasks/main.yml
+++ b/roles/kiosk/tasks/main.yml
@@ -1,15 +1,15 @@
 - name: install extra packages from stable
   apt: name={{ extra_pkgs }} state=latest
 
-- name: add {{ deb_release }}-backports
+- name: add {{ ansible_distribution_release }}-backports
   apt_repository:
-    repo: deb http://deb.debian.org/debian/ {{ deb_release }}-backports main
+    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main
     state: present
     update_cache: yes
   when: extra_pkgs_bpo|length
 
 - name: install extra packages from backports
-  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ deb_release }}-backports
+  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ ansible_distribution_release }}-backports
   when: extra_pkgs_bpo|length
 
 ## Check which display manager is used:
diff --git a/roles/lan-client/tasks/main.yml b/roles/lan-client/tasks/main.yml
index f86861b..d779d09 100644
--- a/roles/lan-client/tasks/main.yml
+++ b/roles/lan-client/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - fail: msg="The machine's domain must not be empty."
-  when: ansible_domain | length == 0 
+  when: ansible_domain | length == 0
 
 - name: preseed krb5-config realm
   debconf:
@@ -34,7 +34,21 @@
     state: latest
 
 ## oddjob-mkhomedir works only with sec=sys for the NFSv4 share
-    
+
+- name: install extra packages from stable
+  apt: name={{ extra_pkgs }} state=latest
+
+- name: add {{ ansible_distribution_release }}-backports
+  apt_repository:
+    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main
+    state: present
+    update_cache: yes
+  when: extra_pkgs_bpo|length
+
+- name: install extra packages from backports
+  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ ansible_distribution_release }}-backports
+  when: extra_pkgs_bpo|length
+
 - name: provide identities from directory
   template:
     src: sssd.conf.j2