diff --git a/roles/nat_server/tasks/main.yml b/roles/nat_server/tasks/main.yml
index e5e3f9c2c86a5ba80d4ecf1bfe404647d949efb2..cefd82f1bafb89fb0551b4b2132fc869bfbc8923 100644
--- a/roles/nat_server/tasks/main.yml
+++ b/roles/nat_server/tasks/main.yml
@@ -69,11 +69,9 @@
   become_user: root
 
 - name: Enable and start keepalived
-  ansible.builtin.systemd:
+  service:
     name: keepalived
     state: started
     enabled: yes
   become: true
   become_user: root
-
-
diff --git a/roles/nat_server/templates/keepalived.conf.j2 b/roles/nat_server/templates/keepalived.conf.j2
index dd3c29235fdfc8b4b702f025e850e3d2708d95ec..2c51d504248b6c5bd64399a89fc23e5ed818a38a 100644
--- a/roles/nat_server/templates/keepalived.conf.j2
+++ b/roles/nat_server/templates/keepalived.conf.j2
@@ -4,12 +4,15 @@ global_defs {
 }
 
 vrrp_instance VI_1 {
-   {% if 'login1' in inventory_hostname %}
+   {% if inventory_hostname == NAT_master|string() %}
       {% set role = 'MASTER' %}
       {% set priority = '100' %}
-   {% else %}
+   {% elif inventory_hostname == NAT_backup1|string() %}
       {% set role = 'BACKUP' %}
       {% set priority = '101' %}
+   {% elif inventory_hostname == NAT_backup2|string() %}
+      {% set role = 'BACKUP' %}
+      {% set priority = '102' %}
    {% endif %}
 
     state {{ role }}
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
diff --git a/roles/slurm-start/templates/slurmd.service.j2 b/roles/slurm-start/templates/slurmd.service.j2
index 36c56120c0e7a061f9d58f25ae7226468fb1c7a2..ef58f099aeacaee68e005e7d3d82e9b8b2bb2375 100644
--- a/roles/slurm-start/templates/slurmd.service.j2
+++ b/roles/slurm-start/templates/slurmd.service.j2
@@ -9,6 +9,7 @@ Type=forking
 KillMode=process
 LimitMEMLOCK=infinity
 #EnvironmentFile=/etc/default/slurmd
+#ExecStart={{ slurm_dir }}/sbin/slurmd $SLURMD_OPTIONS # before slurm20
 ExecStart={{ slurm_dir }}/sbin/slurmd --conf-server {{ slurmctrl }}:6817
 PIDFile={{ slurmpiddir }}/slurmd.pid