diff --git a/roles/k3s_server/tasks/join_master.yml b/roles/k3s_server/tasks/join_master.yml
index 9609580..2b42d91 100644
--- a/roles/k3s_server/tasks/join_master.yml
+++ b/roles/k3s_server/tasks/join_master.yml
@@ -11,9 +11,19 @@
   ansible.builtin.command:
     cmd: >-
       systemd-run -p RestartSec=2 -p Restart=on-failure --unit=k3s-init
-      k3s server {{ hostvars[joining_master].server_init_args }}
+      k3s server {{ joining_server_args }}
     creates: "{{ systemd_dir }}/k3s-init.service"
   delegate_to: "{{ joining_master }}"
+  no_log: true
+  vars:
+    primary_master: "{{ groups[group_name_master | default('master')][0] }}"
+    primary_master_api: >-
+      {{ hostvars[primary_master].k3s_node_ip | split(',') | first | ansible.utils.ipwrap }}
+    joining_server_args: >-
+      {{ hostvars[joining_master].server_init_args | default('--server https://' +
+      primary_master_api + ':6443 --token ' +
+      (hostvars[joining_master].k3s_token | default(k3s_token)) + ' ' +
+      (hostvars[joining_master].extra_server_args | default(''))) }}
 
 - name: Wait for primary registration of {{ joining_master }}
   ansible.builtin.command:
diff --git a/roles/k3s_server/tasks/main.yml b/roles/k3s_server/tasks/main.yml
index a921e3e..5a459b7 100644
--- a/roles/k3s_server/tasks/main.yml
+++ b/roles/k3s_server/tasks/main.yml
@@ -38,6 +38,7 @@
   ansible.builtin.command:
     cmd: systemd-run -p RestartSec=2 -p Restart=on-failure --unit=k3s-init k3s server {{ server_init_args }}
     creates: "{{ systemd_dir }}/k3s-init.service"
+  no_log: true
   when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname']
 
 - name: Wait for the first master Kubernetes API before joining other masters