diff --git a/ansible.cfg b/ansible.cfg
index 48bc18c45..0ae274f73 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,2 +1,5 @@
 [defaults]
 retry_files_enabled = False
+
+[connection]
+pipelining = True
diff --git a/examples/hosts b/examples/hosts
index b8997b777..3b14f09e4 100644
--- a/examples/hosts
+++ b/examples/hosts
@@ -4,11 +4,12 @@
 # To connect using a non-root user (and elevate to root with sudo later),
 # replace `ansible_ssh_user=root` with something like this: `ansible_ssh_user=username become=true become_user=root`
 #
-# For improved Ansible performance, SSH pipelining is enabled by default (`ansible_ssh_pipelining=yes`).
-# If this causes SSH connection troubles, feel free to disable it.
+# For improved Ansible performance, SSH pipelining is enabled by default in `ansible.cfg`.
+# If this causes SSH connection troubles, disable it by adding `ansible_ssh_pipelining=False`
+# to the host line below or by adding `ansible_ssh_pipelining: False` to your variables file.
 #
 # If you're running this Ansible playbook on the same server as the one you're installing to,
 # consider adding an additional `ansible_connection=local` argument below.
 
 [matrix_servers]
-matrix.<your-domain> ansible_host=<your-server's external IP address> ansible_ssh_user=root ansible_ssh_pipelining=yes
+matrix.<your-domain> ansible_host=<your-server's external IP address> ansible_ssh_user=root