diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10d13adf..4000d324 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ The **patch** part changes incrementally at each release.
 * evobackup-client role to configure a machine for backups with bkctld(8)
 
 ### Changed
+* replace version_compare() with version()s
 * removed some deprecations for Ansible 2.7
 * apache: improve permissions in save_apache_status script
 * apt: hold packages only if package is installed
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index e8f1b2b8..b7611cac 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -12,7 +12,7 @@
   tags:
     - apache
     - packages
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: packages are installed (jessie)
   apt:
diff --git a/apt/tasks/main.yml b/apt/tasks/main.yml
index fcd401b5..92f06856 100644
--- a/apt/tasks/main.yml
+++ b/apt/tasks/main.yml
@@ -4,7 +4,7 @@
   fail:
     msg: only compatible with Debian >= 8
   when:
-    - ansible_distribution != "Debian" or ansible_distribution_major_version is version_compare('8', '<')
+    - ansible_distribution != "Debian" or ansible_distribution_major_version is version('8', '<')
   tags:
     - apt
 
diff --git a/certbot/tasks/main.yml b/certbot/tasks/main.yml
index a15c4ff4..99574e96 100644
--- a/certbot/tasks/main.yml
+++ b/certbot/tasks/main.yml
@@ -4,7 +4,7 @@
   assert:
     that:
       - ansible_distribution == "Debian"
-      - ansible_distribution_major_version is version_compare('9', '>=')
+      - ansible_distribution_major_version is version('9', '>=')
     msg: only compatible with Debian 9+
 
 - name: certbot package is installed
diff --git a/elasticsearch/tasks/tmpdir.yml b/elasticsearch/tasks/tmpdir.yml
index 28548b54..086870fe 100644
--- a/elasticsearch/tasks/tmpdir.yml
+++ b/elasticsearch/tasks/tmpdir.yml
@@ -29,7 +29,7 @@
         - restart elasticsearch
       tags:
         - elasticsearch
-      when: elastic_stack_version is version_compare('6', '<')
+      when: elastic_stack_version is version('6', '<')
 
     - name: check if ES_TMPDIR is available (>= 6.x)
       lineinfile:
@@ -41,7 +41,7 @@
         - restart elasticsearch
       tags:
         - elasticsearch
-      when: elastic_stack_version is version_compare('6', '>=')
+      when: elastic_stack_version is version('6', '>=')
 
     - name: change JVM tmpdir (>= 6.x)
       lineinfile:
@@ -53,5 +53,5 @@
         - restart elasticsearch
       tags:
         - elasticsearch
-      when: elastic_stack_version is version_compare('6', '>=')
+      when: elastic_stack_version is version('6', '>=')
   when: (elasticsearch_custom_tmpdir != '' and elasticsearch_custom_tmpdir != None) or fstab_tmp_noexec.rc == 0
diff --git a/etc-git/tasks/main.yml b/etc-git/tasks/main.yml
index c7b6bd63..8d16b79f 100644
--- a/etc-git/tasks/main.yml
+++ b/etc-git/tasks/main.yml
@@ -30,7 +30,7 @@
     gitignore_items: []
   when:
     - _usr_share_scripts.stat.isdir
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 - name: Check if cron is installed
   shell: "dpkg -l cron 2> /dev/null | grep -q -E '^(i|h)i'"
diff --git a/evoacme/tasks/main.yml b/evoacme/tasks/main.yml
index 8ec288ba..ac20cabb 100644
--- a/evoacme/tasks/main.yml
+++ b/evoacme/tasks/main.yml
@@ -3,7 +3,7 @@
 - fail:
     msg: only compatible with Debian >= 8
   when:
-  - ansible_distribution != "Debian" or ansible_distribution_major_version is version_compare('8', '<')
+  - ansible_distribution != "Debian" or ansible_distribution_major_version is version('8', '<')
 
 - include: certbot.yml
 
diff --git a/evoacme/templates/nginx.conf.j2 b/evoacme/templates/nginx.conf.j2
index db1d9953..f76d927d 100644
--- a/evoacme/templates/nginx.conf.j2
+++ b/evoacme/templates/nginx.conf.j2
@@ -1,5 +1,5 @@
 location ~ /.well-known/acme-challenge {
-{% if ansible_distribution_major_version is version_compare('9', '>=') %}
+{% if ansible_distribution_major_version is version('9', '>=') %}
     alias {{ evoacme_acme_dir }}/;
 {% else %}
     alias {{ evoacme_acme_dir }}/.well-known/acme-challenge;
diff --git a/evolinux-base/tasks/fstab.yml b/evolinux-base/tasks/fstab.yml
index 4a6feae2..bb70fde8 100644
--- a/evolinux-base/tasks/fstab.yml
+++ b/evolinux-base/tasks/fstab.yml
@@ -66,6 +66,6 @@
     state: mounted
   when:
   - evolinux_fstab_dev_shm
-  - ansible_distribution_major_version is version_compare('10', '>=')
+  - ansible_distribution_major_version is version('10', '>=')
 
 - meta: flush_handlers
diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index f7c07fee..6fb88d8a 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -71,7 +71,7 @@
       apt_key:
         # url: https://hwraid.le-vert.net/debian/hwraid.le-vert.net.gpg.key
         data: "{{ lookup('file', 'hwraid.le-vert.net.gpg.key') }}"
-      when: ansible_distribution_major_version is version_compare('9', '>=')
+      when: ansible_distribution_major_version is version('9', '>=')
 
     - name: Add HW tool repository
       apt_repository:
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index ef814cb8..aa1393cf 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -4,7 +4,7 @@
   assert:
     that:
       - ansible_distribution == "Debian"
-      - ansible_distribution_major_version is version_compare('8', '>=')
+      - ansible_distribution_major_version is version('8', '>=')
     msg: only compatible with Debian >= 8
 
 - name: Apt configuration
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index e75d864e..bbacfa98 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -93,7 +93,7 @@
     name: net-tools
   when:
     - evolinux_packages_stretch
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
 
 - name: Install/Update packages for Buster and later
   apt:
@@ -102,7 +102,7 @@
       - binutils
   when:
     - evolinux_packages_buster
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 - name: Customize logcheck recipient
   lineinfile:
@@ -141,6 +141,6 @@
     state: absent
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
 
 - meta: flush_handlers
diff --git a/evolinux-base/tasks/root.yml b/evolinux-base/tasks/root.yml
index 517c63cc..5d413165 100644
--- a/evolinux-base/tasks/root.yml
+++ b/evolinux-base/tasks/root.yml
@@ -41,7 +41,7 @@
   lineinfile:
     dest: "/root/.profile"
     line: "PATH=\"${PATH}:/usr/share/scripts\""
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: Custom git config for root
   copy:
diff --git a/evolinux-base/tasks/ssh.yml b/evolinux-base/tasks/ssh.yml
index f210b551..2816af7f 100644
--- a/evolinux-base/tasks/ssh.yml
+++ b/evolinux-base/tasks/ssh.yml
@@ -27,7 +27,7 @@
   notify: reload sshd
   when:
     - evolinux_ssh_password_auth_addresses != []
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 - name: Security directives for Evolinux (Jessie/Stretch)
   blockinfile:
@@ -41,7 +41,7 @@
   notify: reload sshd
   when:
     - evolinux_ssh_password_auth_addresses != []
-    - ansible_distribution_major_version is version_compare('10', '<')
+    - ansible_distribution_major_version is version('10', '<')
 
 # We disable AcceptEnv because it can be a security issue, but also because we
 # do not want clients to push their environment variables like LANG.
@@ -59,7 +59,7 @@
     regexp: '^#?LogLevel [A-Z]+'
     replace: "LogLevel VERBOSE"
   notify: reload sshd
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "Get current user"
   command: logname
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index 6a499615..55820890 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -153,7 +153,7 @@
     mode: "0755"
   when:
     - evolinux_system_alert5_init
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 - name: Install alert5 service (buster)
   copy:
@@ -163,7 +163,7 @@
     mode: "0644"
   when:
     - evolinux_system_alert5_init
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 - name: Enable alert5 init script (buster)
   systemd:
@@ -173,7 +173,7 @@
   when:
     - evolinux_system_alert5_init
     - evolinux_system_alert5_enable
-    - ansible_distribution_major_version is version_compare('10', '>=')
+    - ansible_distribution_major_version is version('10', '>=')
 
 ## network interfaces
 
diff --git a/evolinux-base/templates/logs/zsyslog.j2 b/evolinux-base/templates/logs/zsyslog.j2
index 5054d777..2fc2bd1a 100644
--- a/evolinux-base/templates/logs/zsyslog.j2
+++ b/evolinux-base/templates/logs/zsyslog.j2
@@ -8,7 +8,7 @@ notifempty
 delaycompress
 compress
 postrotate
-{% if ansible_distribution_major_version is version_compare('10', '>=') %}
+{% if ansible_distribution_major_version is version('10', '>=') %}
     /usr/lib/rsyslog/rsyslog-rotate
 {% else %}
     invoke-rc.d rsyslog rotate > /dev/null
diff --git a/evolinux-users/tasks/main.yml b/evolinux-users/tasks/main.yml
index cbf7b9d7..b3be0c8d 100644
--- a/evolinux-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -4,7 +4,7 @@
   assert:
     that:
       - ansible_distribution == "Debian"
-      - ansible_distribution_major_version is version_compare('8', '>=')
+      - ansible_distribution_major_version is version('8', '>=')
     msg: only compatible with Debian >= 8
 
 - debug:
diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index c1845246..e21f0978 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -28,9 +28,9 @@
 
 - set_fact:
     # If "AllowGroups is present" or "AllowUsers is absent and Debian 10+",
-    ssh_allowgroups: "{{ (grep_allowgroups_ssh.rc == 0) or (grep_allowusers_ssh.rc != 0 and (ansible_distribution_major_version is version_compare('10', '>='))) }}"
+    ssh_allowgroups: "{{ (grep_allowgroups_ssh.rc == 0) or (grep_allowusers_ssh.rc != 0 and (ansible_distribution_major_version is version('10', '>='))) }}"
     # If "AllowGroups is absent" and "AllowUsers is absent or Debian <10"
-    ssh_allowusers:  "{{ (grep_allowusers_ssh.rc == 0) or (grep_allowgroups_ssh.rc != 0 and (ansible_distribution_major_version is version_compare('10', '<'))) }}"
+    ssh_allowusers:  "{{ (grep_allowusers_ssh.rc == 0) or (grep_allowgroups_ssh.rc != 0 and (ansible_distribution_major_version is version('10', '<'))) }}"
 
 - debug:
     var: ssh_allowgroups
diff --git a/evolinux-users/tasks/sudo.yml b/evolinux-users/tasks/sudo.yml
index 3197efc4..2f2ee07c 100644
--- a/evolinux-users/tasks/sudo.yml
+++ b/evolinux-users/tasks/sudo.yml
@@ -4,6 +4,6 @@
   when: ansible_distribution_release == "jessie"
 
 - include: sudo_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - meta: flush_handlers
diff --git a/evolinux-users/tasks/user.yml b/evolinux-users/tasks/user.yml
index 36a7b8f1..2f5e4e43 100644
--- a/evolinux-users/tasks/user.yml
+++ b/evolinux-users/tasks/user.yml
@@ -63,14 +63,14 @@
   group:
     name: "{{ evolinux_ssh_group }}"
     state: present
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: "Unix user '{{ user.name }}' belongs to group '{{ evolinux_ssh_group }}' (Debian 10 or later)"
   user:
     name: '{{ user.name }}'
     groups: "{{ evolinux_ssh_group }}"
     append: yes
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 ## Optional group for all evolinux users
 
@@ -81,7 +81,7 @@
   when:
     - evolinux_internal_group is defined
     - evolinux_internal_group != ""
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
 
 - name: "Unix user '{{ user.name }}' belongs to group '{{ evolinux_internal_group }}' (Debian 9 or later)"
   user:
@@ -91,7 +91,7 @@
   when:
     - evolinux_internal_group is defined
     - evolinux_internal_group != ""
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
 
 ## Optional secondary groups, defined per user
 
diff --git a/lxc/tasks/main.yml b/lxc/tasks/main.yml
index e4392556..982a6898 100644
--- a/lxc/tasks/main.yml
+++ b/lxc/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: Install lxc-templates on Buster
   apt:
     name: lxc-templates
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: Copy LXC default containers configuration
   template:
diff --git a/lxc/templates/default.conf b/lxc/templates/default.conf
index 08e5bfb2..a656fd3c 100644
--- a/lxc/templates/default.conf
+++ b/lxc/templates/default.conf
@@ -7,7 +7,7 @@ lxc.id_map = g 0 100000 10000
 
 {% endif %}
 # Set the default network virtualization method.
-{% if ansible_distribution_major_version is version_compare('9', '<=') %}
+{% if ansible_distribution_major_version is version('9', '<=') %}
 lxc.network.type = {{lxc_network_type}}
 {% else %}
 lxc.net.0.type = {{lxc_network_type}}
@@ -21,7 +21,7 @@ lxc.mount.entry = {{lxc_mount_part}} {{lxc_mount_part |replace('/', '')}} none b
 {% endif %}
 # Only one tty is enough.
 # This require that you disabled others tty ([2-6]) in systemd.
-{% if ansible_distribution_major_version is version_compare('9', '<=') %}
+{% if ansible_distribution_major_version is version('9', '<=') %}
 lxc.tty = 1
 {% else %}
 lxc.tty.max = 1
diff --git a/mongodb/tasks/main.yml b/mongodb/tasks/main.yml
index d6f80959..a054a5fd 100644
--- a/mongodb/tasks/main.yml
+++ b/mongodb/tasks/main.yml
@@ -12,4 +12,4 @@
   when: ansible_distribution_release == "stretch"
 
 - include: main_buster.yml
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml
index 9c3ceb8e..bf0013df 100644
--- a/mysql-oracle/tasks/utils.yml
+++ b/mysql-oracle/tasks/utils.yml
@@ -27,7 +27,7 @@
 # - name: "mysql-utilities are installed (Debian 9 or later)"
 #   apt:
 #     name: mysql-utilities
-#   when: ansible_distribution_major_version is version_compare('9', '>=')
+#   when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "mytop dependencies are installed (stretch)"
   apt:
@@ -49,7 +49,7 @@
       - mariadb-client-10.3
       - libconfig-inifiles-perl
       - libterm-readkey-perl
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - include_role:
     name: evolix/remount-usr
@@ -68,7 +68,7 @@
   tags:
     - mytop
     - mysql
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Read debian-sys-maint password
   shell: 'cat /etc/mysql/debian.cnf | grep -m1 "password = .*" | cut -d" " -f3'
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index 0254dd51..0d539c51 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -4,19 +4,19 @@
     mysql_restart_handler_name: "{{ mysql_restart_if_needed | bool | ternary('restart mysql', 'restart mysql (noop)') }}"
 
 - include: packages_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - include: packages_jessie.yml
   when: ansible_distribution_release == "jessie"
 
 - include: users_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - include: users_jessie.yml
   when: ansible_distribution_release == "jessie"
 
 - include: config_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - include: config_jessie.yml
   when: ansible_distribution_release == "jessie"
diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml
index 322f21c8..7609a81e 100644
--- a/mysql/tasks/utils.yml
+++ b/mysql/tasks/utils.yml
@@ -38,7 +38,7 @@
       - mariadb-client-10.3
       - libconfig-inifiles-perl
       - libterm-readkey-perl
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: Read debian-sys-maint password
   shell: 'cat /etc/mysql/debian.cnf | grep -m1 "password = .*" | cut -d" " -f3'
@@ -92,7 +92,7 @@
     - packages
     - percona-toolkit
     - mysql
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 # automatic optimizations
 
diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml
index ea760f9e..6fb47e0b 100644
--- a/packweb-apache/tasks/main.yml
+++ b/packweb-apache/tasks/main.yml
@@ -3,7 +3,7 @@
 - fail:
     msg: only compatible with Debian >= 8
   when:
-    - ansible_distribution != "Debian" or ansible_distribution_major_version is version_compare('8', '<')
+    - ansible_distribution != "Debian" or ansible_distribution_major_version is version('8', '<')
 
 - name: install info.php
   copy:
@@ -67,7 +67,7 @@
     src: userlogrotate
     dest: /etc/cron.weekly/userlogrotate
     mode: "0755"
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Force DIR_MODE to 0750 in /etc/adduser.conf
   lineinfile:
diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml
index d10e61ea..fc3e6d32 100644
--- a/packweb-apache/tasks/phpmyadmin.yml
+++ b/packweb-apache/tasks/phpmyadmin.yml
@@ -7,7 +7,7 @@
 - name: Install phpmyadmin (Debian <=9)
   apt:
     name: phpmyadmin
-  when: ansible_distribution_major_version is version_compare('9', '<=')
+  when: ansible_distribution_major_version is version('9', '<=')
 
 - include_role:
     name: evolix/remount-usr
@@ -17,7 +17,7 @@
 - name: Install phpmyadmin using sid package (Debian >=10)
   apt:
     deb: http://mirror.evolix.org/debian/pool/main/p/phpmyadmin/phpmyadmin_4.6.6-4_all.deb
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: Check if phpmyadmin default configuration is present
   stat:
diff --git a/php/tasks/config_fpm.yml b/php/tasks/config_fpm.yml
index 4c6c855e..1f6ae6ed 100644
--- a/php/tasks/config_fpm.yml
+++ b/php/tasks/config_fpm.yml
@@ -57,7 +57,7 @@
     - { option: "pm.status_path", value: "/fpm_status" }
     - { option: "request_terminate_timeout", value: "60s" }
   notify: "restart {{ php_fpm_service_name }}"
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Custom PHP FPM values
   copy:
diff --git a/php/tasks/main.yml b/php/tasks/main.yml
index cec4a28d..2fd1a250 100644
--- a/php/tasks/main.yml
+++ b/php/tasks/main.yml
@@ -3,7 +3,7 @@
 - fail:
     msg: only compatible with Debian >= 8
   when:
-  - ansible_distribution != "Debian" or ansible_distribution_major_version is version_compare('8', '<')
+  - ansible_distribution != "Debian" or ansible_distribution_major_version is version('8', '<')
 
 - include: main_jessie.yml
   when: ansible_distribution_release == "jessie"
diff --git a/postgresql/tasks/main.yml b/postgresql/tasks/main.yml
index db670051..41ea5456 100644
--- a/postgresql/tasks/main.yml
+++ b/postgresql/tasks/main.yml
@@ -5,10 +5,10 @@
   when: ansible_distribution_release == "jessie"
 
 - include: packages_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '=')
+  when: ansible_distribution_major_version is version('9', '=')
 
 - include: packages_buster.yml
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - include: config.yml
 
diff --git a/postgresql/templates/postgresql.conf.j2 b/postgresql/templates/postgresql.conf.j2
index e92d6489..25597519 100644
--- a/postgresql/templates/postgresql.conf.j2
+++ b/postgresql/templates/postgresql.conf.j2
@@ -3,7 +3,7 @@ shared_buffers = {{ postgresql_shared_buffers }}
 work_mem = {{ postgresql_work_mem }}
 #shared_preload_libraries = 'pg_stat_statements'
 #synchronous_commit = off
-{% if postgresql_version is version_compare('9.5', '<') %}
+{% if postgresql_version is version('9.5', '<') %}
 checkpoint_segments = 30
 {% else %}
 max_wal_size = 15GB
diff --git a/redis/tasks/instance-server.yml b/redis/tasks/instance-server.yml
index ff187f45..e87c6ce9 100644
--- a/redis/tasks/instance-server.yml
+++ b/redis/tasks/instance-server.yml
@@ -44,7 +44,7 @@
     - "{{ redis_conf_dir }}/redis-server.post-down.d"
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '=')
+    - ansible_distribution_major_version is version('9', '=')
   tags:
     - redis
 
@@ -59,7 +59,7 @@
     - "redis-server.post-down.d"
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '=')
+    - ansible_distribution_major_version is version('9', '=')
   tags:
     - redis
 
@@ -99,7 +99,7 @@
     group: "root"
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '<')
+    - ansible_distribution_major_version is version('9', '<')
   tags:
     - redis
 
@@ -112,7 +112,7 @@
     group: "root"
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
   tags:
     - redis
 
diff --git a/redis/tasks/nrpe.yml b/redis/tasks/nrpe.yml
index f361c9c1..f499ed2f 100644
--- a/redis/tasks/nrpe.yml
+++ b/redis/tasks/nrpe.yml
@@ -18,7 +18,7 @@
     group: root
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '<')
+    - ansible_distribution_major_version is version('9', '<')
   tags:
     - redis
     - nrpe
@@ -28,7 +28,7 @@
     redis_check_redis_path: /usr/local/lib/nagios/plugins/check_redis
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '<')
+    - ansible_distribution_major_version is version('9', '<')
   tags:
     - redis
     - nrpe
@@ -38,7 +38,7 @@
     redis_check_redis_path: /usr/lib/nagios/plugins/check_redis
   when:
     - ansible_distribution == "Debian"
-    - ansible_distribution_major_version is version_compare('9', '>=')
+    - ansible_distribution_major_version is version('9', '>=')
   tags:
     - redis
     - nrpe
diff --git a/redis/templates/redis.conf.j2 b/redis/templates/redis.conf.j2
index 18ebdcb7..b10a11b9 100644
--- a/redis/templates/redis.conf.j2
+++ b/redis/templates/redis.conf.j2
@@ -36,7 +36,7 @@ rdbcompression {{ redis_rdbcompression | bool | ternary('yes','no') }}
 dbfilename {{ redis_data_file }}
 dir {{ redis_data_dir }}
 
-{% if redis_installed_version is version_compare('3.2', '>=') %}
+{% if redis_installed_version is version('3.2', '>=') %}
 protected-mode {{ redis_protected_mode | bool | ternary('yes','no') }}
 {% endif %}
 
diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml
index e2b4768d..68f721f8 100644
--- a/squid/tasks/main.yml
+++ b/squid/tasks/main.yml
@@ -3,7 +3,7 @@
 - fail:
     msg: only compatible with Debian >= 8
   when:
-  - ansible_distribution != "Debian" or ansible_distribution_major_version is version_compare('8', '<')
+  - ansible_distribution != "Debian" or ansible_distribution_major_version is version('8', '<')
 
 - name: "Set squid name (jessie)"
   set_fact:
@@ -13,7 +13,7 @@
 - name: "Set squid name (Debian 9 or later)"
   set_fact:
     squid_daemon_name: squid
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "Install Squid packages"
   apt:
@@ -26,7 +26,7 @@
   copy:
     src: default_squid
     dest: /etc/default/squid
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "squid.conf is present (jessie)"
   template:
@@ -48,14 +48,14 @@
     src: evolinux-defaults.conf
     dest: /etc/squid/evolinux-defaults.conf
   notify: "restart squid"
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux defaults whitelist (Debian 9 or later)"
   copy:
     src: evolinux-whitelist-defaults.conf
     dest: /etc/squid/evolinux-whitelist-defaults.conf
   notify: "reload squid"
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux custom whitelist (Debian 9 or later)"
   copy:
@@ -63,7 +63,7 @@
     content: |
       # Put customized values here.
     force: no
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux acl for local proxy (Debian 9 or later)"
   template:
@@ -71,7 +71,7 @@
     dest: /etc/squid/evolinux-acl.conf
     force: no
   notify: "reload squid"
-  when: squid_localproxy_enable and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable and ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux custom acl (Debian 9 or later)"
   copy:
@@ -79,7 +79,7 @@
     content: |
       # Put customized values here.
     force: no
-  when: squid_localproxy_enable == False and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable == False and ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux http_access for local proxy (Debian 9 or later)"
   copy:
@@ -87,7 +87,7 @@
     dest: /etc/squid/evolinux-httpaccess.conf
     force: no
   notify: "reload squid"
-  when: squid_localproxy_enable and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable and ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux custom http_access (Debian 9 or later)"
   copy:
@@ -95,7 +95,7 @@
     content: |
       # Put customized values here.
     force: no
-  when: squid_localproxy_enable == False and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable == False and ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux overrides for local proxy (Debian 9 or later)"
   template:
@@ -103,7 +103,7 @@
     dest: /etc/squid/evolinux-custom.conf
     force: no
   notify: "reload squid"
-  when: squid_localproxy_enable and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable and ansible_distribution_major_version is version('9', '>=')
 
 - name: "evolinux custom overrides (Debian 9 or later)"
   copy:
@@ -111,7 +111,7 @@
     content: |
       # Put customized values here.
     force: no
-  when: squid_localproxy_enable == False and ansible_distribution_major_version is version_compare('9', '>=')
+  when: squid_localproxy_enable == False and ansible_distribution_major_version is version('9', '>=')
 
 - name: add some URL in whitelist (Debian 8)
   lineinfile:
@@ -131,16 +131,16 @@
     state: present
   with_items: '{{ squid_whitelist_items }}'
   notify: "reload squid"
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - include: systemd.yml
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - include: logrotate_jessie.yml
   when: ansible_distribution_release == "jessie"
 
 - include: logrotate_stretch.yml
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - include: minifirewall.yml
 
diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index f9651802..c55218ef 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -25,7 +25,7 @@
     mode: "0700"
     owner: root
     group: root
-  when: ansible_distribution_major_version is version_compare('9', '<=')
+  when: ansible_distribution_major_version is version('9', '<=')
   notify: reload varnish
   tags:
   - varnish
diff --git a/webapps/evoadmin-web/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml
index 70105691..7d3f6051 100644
--- a/webapps/evoadmin-web/tasks/packages.yml
+++ b/webapps/evoadmin-web/tasks/packages.yml
@@ -8,7 +8,7 @@
   apt:
     name: php-pear
     state: present
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 # /!\ Warning, this is a temporary hack
 - include_role:
@@ -21,7 +21,7 @@
     state: present
   with_items:
     - 'http://mirror.evolix.org/debian/pool/main/p/php-log/php-log_1.12.9-2_all.deb'
-  when: ansible_distribution_major_version is version_compare('10', '>=')
+  when: ansible_distribution_major_version is version('10', '>=')
 
 - name: Install PHP packages (stretch)
   apt:
diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml
index 7ca5d63c..32b0d488 100644
--- a/webapps/evoadmin-web/tasks/user.yml
+++ b/webapps/evoadmin-web/tasks/user.yml
@@ -22,7 +22,7 @@
 - name: "Create www-evoadmin (Debian 9 or later)"
   user:
     name: www-evoadmin
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Is /etc/aliases present?
   stat:
@@ -62,7 +62,7 @@
     dest: "{{ evoadmin_document_root }}"
     version: master
     update: False
-  when: ansible_distribution_major_version is version_compare('9', '>=')
+  when: ansible_distribution_major_version is version('9', '>=')
 
 - name: Change ownership on git repository
   file:
diff --git a/webapps/evoadmin-web/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml
index e1e9e5f1..ef360340 100644
--- a/webapps/evoadmin-web/tasks/web.yml
+++ b/webapps/evoadmin-web/tasks/web.yml
@@ -16,7 +16,7 @@
     option: "disable_functions"
     value: "shell-exec,system,passthru,putenv,popen"
   notify: reload apache2
-  when: ansible_distribution_major_version is version_compare('9', '=')
+  when: ansible_distribution_major_version is version('9', '=')
 
 - name: "Set custom values for PHP config (Debian 10)"
   ini_file:
@@ -25,7 +25,7 @@
     option: "disable_functions"
     value: "shell-exec,system,passthru,putenv,popen"
   notify: reload apache2
-  when: ansible_distribution_major_version is version_compare('10', '=')
+  when: ansible_distribution_major_version is version('10', '=')
 
 - name: Install evoadmin VHost
   template: