diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl
index ca9166d..3528e4e 100644
--- a/.infra/Freyfile.hcl
+++ b/.infra/Freyfile.hcl
@@ -10,6 +10,10 @@ global {
     }
     defaults {
       host_key_checking = false
+      ansible_managed = "Ansible managed"
+    }
+    ssh_connection {
+      pipelining = true
     }
   }
 }
@@ -138,10 +142,21 @@ install {
       notify = ["Common | Update timezone"]
     }
 
+    tasks {
+      name       = "Common | Disable UseDNS for SSHD"
+      lineinfile = "dest=/etc/ssh/sshd_config regexp=\"^UseDNS\" line=\"UseDNS no\" state=present"
+      notify     = ["Common | Restart sshd"]
+    }
+
     handlers {
       name    = "Common | Update timezone"
       command = "dpkg-reconfigure --frontend noninteractive tzdata"
     }
+
+    handlers {
+      name    = "Common | Restart sshd"
+      service = "name=ssh state=restarted"
+    }
   }
 }