diff --git a/kiosk.yml b/kiosk.yml
index 408485b..2df8628 100644
--- a/kiosk.yml
+++ b/kiosk.yml
@@ -6,6 +6,7 @@
   remote_user: ansible
   become: yes
   vars:
+    deb_release: "buster"
     auto_user: debi
     wifi_ssid: "YOUR SSID HERE"
     wifi_passwd: "YOUR WIFI-PW HERE"
@@ -13,8 +14,8 @@
       - unattended-upgrades
       - webext-privacy-badger
       - webext-ublock-origin
-    extra_pkgs_bpo:
-      - libreoffice
+
+    extra_pkgs_bpo: []  #[ libreoffice ]
 
   roles:
     - up2date-debian
diff --git a/local.yml b/local.yml
index 200ea21..dba6a24 100644
--- a/local.yml
+++ b/local.yml
@@ -5,6 +5,7 @@
   hosts: localhost
   remote_user: root
   vars:
+    deb_release: "buster"
     auto_user: debi
     wifi_ssid: "YOUR SSID HERE"
     wifi_passwd: "YOUR WIFI-PW HERE"
@@ -13,3 +14,10 @@
     - up2date-debian
     - gnome
     - kiosk
+
+  extra_pkgs:
+    - unattended-upgrades
+    - webext-privacy-badger
+    - webext-ublock-origin
+
+  extra_pkgs_bpo: []  # [ libreoffice ]
diff --git a/roles/gnome/files/defaults b/roles/gnome/files/defaults
index e612540..fce297b 100644
--- a/roles/gnome/files/defaults
+++ b/roles/gnome/files/defaults
@@ -1,8 +1,5 @@
 [org/gnome/shell]
-enabled-extensions=['apps-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com']
-
-[org/gnome/desktop/background]
-show-desktop-icons=true
+enabled-extensions=['apps-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com']
 
 [org/gnome/desktop/input-sources]
 sources=[('xkb', 'tr'), ('xkb', 'de'), ('xkb', 'us')]
@@ -15,9 +12,6 @@ natural-scroll=false
 edge-scrolling-enabled=true
 tap-to-click=true
 
-[org/gnome/nautilus/desktop]
-home-icon-visible=false
-
 [org/gnome/nautilus/preferences]
 default-folder-viewer='list-view'
 
diff --git a/roles/kiosk/tasks/main.yml b/roles/kiosk/tasks/main.yml
index 288c461..c7d478c 100644
--- a/roles/kiosk/tasks/main.yml
+++ b/roles/kiosk/tasks/main.yml
@@ -1,16 +1,16 @@
-- name: add stretch-backports
+- name: install extra packages from stable
+  apt: name={{ extra_pkgs }} state=latest
+
+- name: add {{ deb_release }}-backports
   apt_repository:
-    repo: deb http://deb.debian.org/debian/ stretch-backports main
+    repo: deb http://deb.debian.org/debian/ {{ deb_release }}-backports main
     state: present
     update_cache: yes
-
-- name: install extra packages from stable
-  apt: name={{ item }} state=latest
-  with_items: "{{ extra_pkgs }}"
+  when: extra_pkgs_bpo|length
 
 - name: install extra packages from backports
-  apt: name={{ item }} state=latest default_release=stretch-backports
-  with_items: "{{ extra_pkgs_bpo }}"
+  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ deb_release }}-backports
+  when: extra_pkgs_bpo|length
 
 - name: check if gdm3 is installed
   stat: path=/etc/gdm3/daemon.conf
diff --git a/roles/up2date-debian/tasks/main.yml b/roles/up2date-debian/tasks/main.yml
index 81d2d5c..85b734b 100644
--- a/roles/up2date-debian/tasks/main.yml
+++ b/roles/up2date-debian/tasks/main.yml
@@ -11,9 +11,9 @@
     autoremove: yes
 
 - name: install some packages
-  apt: name={{ item }} state=latest
-  with_items:
-    - etckeeper
+  apt:
+    name: etckeeper
+    state: latest
 
 #- name: clean apt package cache
 #  command: apt clean