diff --git a/roles/base/templates/etc/default/grub.j2 b/roles/base/templates/etc/default/grub.j2
index 28afa04..9ca540a 100644
--- a/roles/base/templates/etc/default/grub.j2
+++ b/roles/base/templates/etc/default/grub.j2
@@ -3,7 +3,7 @@
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR="PVC Parallel Virtual Cluster - Debian"
-{% if ansible_distribution_major_version|int >= 11 %}
+{% if debian_version|int >= 11 %}
 GRUB_CMDLINE_LINUX="systemd.unified_cgroup_hierarchy=1 {{ grub_cmdline }}"
 {% else %}
 GRUB_CMDLINE_LINUX="{{ grub_cmdline }}"
diff --git a/roles/pvc/tasks/main.yml b/roles/pvc/tasks/main.yml
index beaab86..c99a648 100644
--- a/roles/pvc/tasks/main.yml
+++ b/roles/pvc/tasks/main.yml
@@ -59,7 +59,7 @@
 # Install CPU tuning
 - include: cputuning/main.yml
   tags: pvc-cputuning
-  when: ansible_distribution_major_version|int >= 11 and cpu_tuning is defined
+  when: debian_version|int >= 11 and cpu_tuning is defined
 
 - name: restart server on first install
   shell: 'sleep 3 && shutdown -r now "Ansible updates triggered"'