diff --git a/salt/libvirt/ssh/files/config b/salt/libvirt/ssh/files/config
index 360d5c182..de6cb7b34 100644
--- a/salt/libvirt/ssh/files/config
+++ b/salt/libvirt/ssh/files/config
@@ -1,2 +1,2 @@
-Host *
+Match user soqemussh
         IdentityFile /etc/ssh/auth_keys/soqemussh/id_ed25519
diff --git a/salt/libvirt/ssh/users.sls b/salt/libvirt/ssh/users.sls
index 0e9c045a0..173a3e095 100644
--- a/salt/libvirt/ssh/users.sls
+++ b/salt/libvirt/ssh/users.sls
@@ -16,10 +16,17 @@
 
 {%     if GLOBALS.is_manager %}
 
-qemu_ssh_client_config:
-  file.managed:
+root_ssh_config:
+  file.touch:
     - name: /root/.ssh/config
+
+qemu_ssh_client_config:
+  file.blockreplace:
+    - name: /root/.ssh/config
+    - marker_start: "# START of block managed by Salt - soqemussh config"
+    - marker_end: "# END of block managed by Salt - soqemussh config"
     - source: salt://libvirt/ssh/files/config
+    - prepend_if_not_found: True
 
 {%     endif %}