diff --git a/.ssh/config.d/10-main b/.ssh/config.d/10-main
new file mode 100644
--- /dev/null
+++ b/.ssh/config.d/10-main
@@ -0,0 +1,15 @@
+ControlPath ~/.ssh/mux/%h-%p-%r
+ControlPersist 10
+
+ExitOnForwardFailure yes
+
+Host *
+        # CVE-2016-0778 workaround
+	UseRoaming no
+
+Host vagrant
+	Hostname 127.0.0.1
+	Port 2222
+	User vagrant
+	IdentityFile ~/.vagrant.d/insecure_private_key
+