diff --git a/cdn/tasks/main.yml b/cdn/tasks/main.yml
index 9a91efb9e2c3b0353b6276b18bcfc7760bb40fde..096c6c8b696b0da1f8dce49456f51985c5be5c0f 100644
--- a/cdn/tasks/main.yml
+++ b/cdn/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: include debian version specific vars
   include_vars:
-    file: "{{debian_version|default('fallback')}}.yml"
+    file: "{{ ansible_distribution_release }}.yml"
 
 - name: install commonly used web libraries
   apt:
diff --git a/cdn/vars/fallback.yml b/cdn/vars/bullseye.yml
similarity index 72%
rename from cdn/vars/fallback.yml
rename to cdn/vars/bullseye.yml
index 92dcc4750c8061a756b3e2a626e596a108104b7d..a32ea8ee35e9eb6999c3f446591021a36615af05 100644
--- a/cdn/vars/fallback.yml
+++ b/cdn/vars/bullseye.yml
@@ -1,7 +1,9 @@
 ---
 
 cdn_packages:
-  - libjs-jquery
   - libjs-bootstrap
+  - libjs-bootstrap4
+  - libjs-chart.js
+  - libjs-jquery
   - libjs-jquery-datatables
   - libjs-jquery-ui
diff --git a/php-fpm/tasks/main.yml b/php-fpm/tasks/main.yml
index 94d2c0db013ede0c3b0b42a578478eb67260ad12..d0217e2c9ca82f994811ebb331fd38b50e68d466 100644
--- a/php-fpm/tasks/main.yml
+++ b/php-fpm/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: include debian version specific vars
-  include_vars: "{{ debian_version }}.yml"
+  include_vars: "{{ ansible_distribution_release }}.yml"
 
 - name: ensure php-fpm is installed
   apt:
diff --git a/php-fpm/vars/bullseye.yml b/php-fpm/vars/bullseye.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9a5220bf30d04e7d4d63b833653f0b744b119c9c
--- /dev/null
+++ b/php-fpm/vars/bullseye.yml
@@ -0,0 +1,3 @@
+---
+php_fpm_pkgs: ["php-fpm"]
+php_version: "7.4"
diff --git a/php-fpm/vars/jessie.yml b/php-fpm/vars/jessie.yml
deleted file mode 100644
index a1918259000478eee9cecc793ab40c44b1a85677..0000000000000000000000000000000000000000
--- a/php-fpm/vars/jessie.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-php_fpm_pkgs: ["php-fpm5", "php5"]
diff --git a/uwsgi-python/tasks/apps/pgadmin4.yml b/uwsgi-python/tasks/apps/pgadmin4.yml
index 9a8660daff13ef1cf4d9a23e99c70e6a6bf5e9eb..32dcda587404dec5eb495467dbbd900d78709cf3 100644
--- a/uwsgi-python/tasks/apps/pgadmin4.yml
+++ b/uwsgi-python/tasks/apps/pgadmin4.yml
@@ -13,7 +13,7 @@
 - name: Enable Postgres APT repository
   apt_repository:
     # yamllint disable-line rule:line-length
-    repo: "deb https://apt.postgresql.org/pub/repos/apt/ {{ debian_version }}-pgdg main"
+    repo: "deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
 
 - name: Debconf pgadmin4
   debconf:
@@ -35,7 +35,7 @@
   apt:
     name: python3-flaskext.wtf
     default_release: stretch-pgdg
-  when: debian_version == "stretch"
+  when: ansible_distribution_release == "stretch"
 
 - name: Fix directory permissions
   file:
diff --git a/uwsgi-python/templates/uwsgi.ini.j2 b/uwsgi-python/templates/uwsgi.ini.j2
index 8686c8dd95f47bee9b1d7752986d04e95066288d..646e3e790f89f1375cb2f54f5a1dd6a1e2de8c97 100644
--- a/uwsgi-python/templates/uwsgi.ini.j2
+++ b/uwsgi-python/templates/uwsgi.ini.j2
@@ -44,10 +44,12 @@ log-x-forwarded-for =
 {% if app_python_version == 2 %}
 plugin = python27
 {% elif app_python_version == 3 %}
-{% if debian_version == "stretch" %}
+{% if ansible_distribution_release == "stretch" %}
 plugin = python35
-{% elif debian_version == "buster" %}
+{% elif ansible_distribution_release == "buster" %}
 plugin = python37
+{% elif ansible_distribution_release == "bullseye" %}
+plugin = python39
 {% endif %}
 {% endif %}
 {% if app_venv != '' %}
diff --git a/uwsgi-python/templates/uwsgi@.service.j2 b/uwsgi-python/templates/uwsgi@.service.j2
index 7602659616daa182c90861e991c24d59354b15d5..8cdf506c486a657c35f030ce6ff4f5f7ccaf31b8 100644
--- a/uwsgi-python/templates/uwsgi@.service.j2
+++ b/uwsgi-python/templates/uwsgi@.service.j2
@@ -8,7 +8,9 @@ ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/bin/kill -INT $MAINPID
 Restart=always
 Type=notify
+{% if ansible_distribution_major_version|int(default=99) < 11 %}
 StandardError=syslog
+{% endif %}
 NotifyAccess=all
 KillSignal=SIGQUIT
 SuccessExitStatus=15 17 29 30
diff --git a/webserver/tasks/main.yml b/webserver/tasks/main.yml
index 187b4ab6acb057e14152632b6ddfbe3e1ef2db01..f74319e95997aae0d430d06b8b651af0437c8f33 100644
--- a/webserver/tasks/main.yml
+++ b/webserver/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: include debian version specific configuration
   include_vars:
-    file: "{{debian_version|default('fallback')}}.yml"
+    file: "{{ ansible_distribution_release }}.yml"
   tags:
     - nginx
     - webservices
diff --git a/webserver/vars/bullseye.yml b/webserver/vars/bullseye.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8998f738e75c174f5d03b02cfe026d050ffc198d
--- /dev/null
+++ b/webserver/vars/bullseye.yml
@@ -0,0 +1,12 @@
+---
+# yamllint disable rule:line-length
+
+protocols:
+  modern: 'TLSv1.3'
+  intermediate: 'TLSv1.2 TLSv1.3'
+ciphers:
+  modern: null
+  intermediate: 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384'
+prefer_server_ciphers:
+  modern: false
+  intermediate: false
diff --git a/webserver/vars/fallback.yml b/webserver/vars/fallback.yml
deleted file mode 100644
index 972a42e1450bb0ac279b0dd3b42025d07eb58702..0000000000000000000000000000000000000000
--- a/webserver/vars/fallback.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# yamllint disable rule:line-length
-
-protocols:
-  modern: 'TLSv1.2'
-  intermediate: 'TLSv1 TLSv1.1 TLSv1.2'
-ciphers:
-  modern: 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'
-  intermediate: 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS'
-prefer_server_ciphers:
-  modern: false
-  intermediate: true