diff --git a/roles/nat_server/templates/keepalived.conf.j2 b/roles/nat_server/templates/keepalived.conf.j2
index 028f847cec39c3bd4ffe116033062f30e7b331a9..2c51d504248b6c5bd64399a89fc23e5ed818a38a 100644
--- a/roles/nat_server/templates/keepalived.conf.j2
+++ b/roles/nat_server/templates/keepalived.conf.j2
@@ -4,13 +4,13 @@ global_defs {
 }
 
 vrrp_instance VI_1 {
-   {% if inventory_hostname == {{ NAT_master }} %}
+   {% if inventory_hostname == NAT_master|string() %}
       {% set role = 'MASTER' %}
       {% set priority = '100' %}
-   {% elif inventory_hostname == {{ NAT_backup1 }} %}
+   {% elif inventory_hostname == NAT_backup1|string() %}
       {% set role = 'BACKUP' %}
       {% set priority = '101' %}
-   {% elif inventory_hostname == {{ NAT_backup2 }} %}
+   {% elif inventory_hostname == NAT_backup2|string() %}
       {% set role = 'BACKUP' %}
       {% set priority = '102' %}
    {% endif %}
diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml
index f87bbd8ea9a8c6bf25611a7ce89448a20d5bf61b..46ae00104660f46488243c165719030c4c2bf1f8 100644
--- a/roles/slurm-common/tasks/installSlurmFromSource.yml
+++ b/roles/slurm-common/tasks/installSlurmFromSource.yml
@@ -28,7 +28,7 @@
   register: stat_ucx
 
 - name: Create ucx directory if it does not exist
-  ansible.builtin.file:
+  file:
     path: /usr/local/ucx/
     state: directory
     owner: damienl
@@ -48,7 +48,7 @@
   register: newucx
 
 - name: symlink ucx to latest
-  ansible.builtin.file:
+  file:
     src: /usr/local/ucx/1.8.0
     dest: /usr/local/ucx/latest
     state: link