diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index d01f592f2..ee9fd6d33 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -193,10 +193,9 @@
 
     - name: Calico | Configure calico network pool
       vars:
-        _calico_blocksize: "{{ {'spec': {'blockSize': (_calico_pool_cmd.stdout | from_json).spec.blockSize } } }}"
-        # We need to specify the dict inside jinja because otherwhise the blockSize can become a string
-        # instead of a int and no amount of | int makes it back into and integer
-        # TODO: use a normal yaml dict after upgrading to ansible-core 2.19, where the issue does not exist
+        _calico_blocksize:
+          spec:
+            blockSize: "{{ (_calico_pool_cmd.stdout | from_json).spec.blockSize }}"
         _calico_pool:
           kind: "IPPool"
           apiVersion: "projectcalico.org/v3"
@@ -236,10 +235,9 @@
 
     - name: Calico | Configure calico IPv6 network pool
       vars:
-        _calico_blocksize_ipv6: "{{ {'spec': {'blockSize': (_calico_pool_ipv6_cmd.stdout | from_json).spec.blockSize } } }}"
-        # We need to specify the dict inside jinja because otherwhise the blockSize can become a string
-        # instead of a int and no amount of | int makes it back into and integer
-        # TODO: use a normal yaml dict after upgrading to ansible-core 2.19, where the issue does not exist
+        _calico_blocksize_ipv6:
+          spec:
+            blockSize: "{{ (_calico_pool_ipv6_cmd.stdout | from_json).spec.blockSize }}"
         _calico_pool_ipv6:
           kind: "IPPool"
           apiVersion: "projectcalico.org/v3"
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 09fcf4a00..c23f44f7e 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -179,8 +179,7 @@
 
 - name: Reset | unmount kubelet dirs
   command: umount -f {{ item }}
-  # TODO: use a simple default after ansible-core>=2.19
-  loop: "{{ (mounted_dirs.ansible_facts.aggregate_mounts if mounted_dirs.ansible_facts is defined else [])
+  loop: "{{ mounted_dirs.ansible_facts.aggregate_mounts | default([])
            | map(attribute='mount')
            | select('match', '/var/lib/kubelet/.*') | reverse }}"
   register: umount_dir