diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml
index 363835d7da5cdc0f154e50fc2768e38e5b21a2eb..d99b6c265f9cb85a9189824ef11369d6b55f1b56 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/tasks/main.yml
@@ -39,7 +39,7 @@
     ingress_nginx_templates: "{{ ingress_nginx_templates_for_psp + ingress_nginx_templates }}"
   when: podsecuritypolicy_enabled
 
-- name: NGINX Ingress Controller | Append extra templates to NGINX Ingress Templates list for PodSecurityPolicy
+- name: NGINX Ingress Controller | Append extra templates to NGINX Ingress Templates list for webhook
   set_fact:
     ingress_nginx_templates: "{{ ingress_nginx_templates + ingress_nginx_templates_for_webhook }}"
   when: ingress_nginx_webhook_enabled
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 2ba53d362bb08ffdf7c9857c1419724d75aa722a..e7711424449ac67b5f4a2b91509cc486e043aa3d 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -143,7 +143,7 @@ calico_allow_ip_forwarding: false
 calico_ipam_strictaffinity: false
 
 # Calico IPAM autoAllocateBlocks
-calcio_ipam_autoallocateblocks: true
+calico_ipam_autoallocateblocks: true
 
 # Calico IPAM maxBlocksPerHost, default 0
 calico_ipam_maxblocksperhost: 0
diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml
index cdb9b30f834110d2d3f99c680a4fab24e15fee0c..1fe4440f15f0e3a5d0d7e44f600d1b2dd76bdc33 100644
--- a/roles/network_plugin/calico/tasks/check.yml
+++ b/roles/network_plugin/calico/tasks/check.yml
@@ -15,6 +15,15 @@
   run_once: True
   delegate_to: "{{ groups['kube_control_plane'][0] }}"
 
+- name: Stop if legacy encapsulation variables are detected (calcio_ipam_autoallocateblocks)
+  assert:
+    that:
+      - calcio_ipam_autoallocateblocks is not defined
+    msg: "'calcio_ipam_autoallocateblocks' configuration variable is deprecated, it's a typo, please configure your inventory with 'calico_ipam_autoallocateblocks' set to 'true' or 'false' according to your specific needs"
+  run_once: True
+  delegate_to: "{{ groups['kube_control_plane'][0] }}"
+
+
 - name: Stop if incompatible network plugin and cloudprovider
   assert:
     that:
diff --git a/roles/network_plugin/calico/templates/calico-ipamconfig.yml.j2 b/roles/network_plugin/calico/templates/calico-ipamconfig.yml.j2
index 3cb85c1bf70c37d8312472bfeb2c405124762b40..af7e2117cef6c93a93cbee1edc5ae9aec560b176 100644
--- a/roles/network_plugin/calico/templates/calico-ipamconfig.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-ipamconfig.yml.j2
@@ -3,6 +3,6 @@ kind: IPAMConfig
 metadata:
   name: default
 spec:
-  autoAllocateBlocks: {{ calcio_ipam_autoallocateblocks }}
+  autoAllocateBlocks: {{ calico_ipam_autoallocateblocks }}
   strictAffinity: {{ calico_ipam_strictaffinity }}
   maxBlocksPerHost: {{ calico_ipam_maxblocksperhost }}