diff --git a/cluster.yml b/cluster.yml
index 9bb149fd2c575801ceb30fece8bbb998136ea511..863f0669bb2d231ea9297f7771bf4fc4a3d664b1 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -2,6 +2,8 @@
 - hosts: all
   any_errors_fatal: true
   gather_facts: false
+  vars:
+    ansible_ssh_pipelining: false
   roles:
     - bootstrap-os
   tags:
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index 5d084ec744b1d0635a0aab49830d658ccc765ce2..a3ebeb8f287dc6127207864fc35beccfcaf64aa2 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -3,4 +3,6 @@
   when: bootstrap_os == "ubuntu"
 
 - include: bootstrap-coreos.yml
-  when: bootstrap_os == "coreos"
\ No newline at end of file
+  when: bootstrap_os == "coreos"
+
+- include: setup-pipelining.yml
diff --git a/roles/bootstrap-os/tasks/setup-pipelining.yml b/roles/bootstrap-os/tasks/setup-pipelining.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ca216cc3baf2bdf0072e657b4ec8fcce224e89e5
--- /dev/null
+++ b/roles/bootstrap-os/tasks/setup-pipelining.yml
@@ -0,0 +1,6 @@
+---
+# Remove requiretty to make ssh pipelining work
+
+- name: Remove require tty
+  lineinfile: regexp="^\w+\s+requiretty" dest=/etc/sudoers state=absent
+