diff --git a/ansible/gold-master.yml b/ansible/gold-master.yml
index 7653559f5241fef5c77304d704afb6b3416cccc3..0cd29c83e6d2f2fa2957a827a2e6bbf39c41c7b7 100644
--- a/ansible/gold-master.yml
+++ b/ansible/gold-master.yml
@@ -16,10 +16,6 @@
             type: nic
 
     # NOTE: on first run this fetches the whole image (~650MB) over the Internet
-    # NOTE: we should be able to leave the container on the "default" profile, which gets a
-    # link-local v6 address and http_proxy pointing at lxdbr0. But this doesn't work:
-    # https://github.com/lxc/lxd/issues/2166
-    # So for now we have to attach to a real bridge and pick up a real IP address
 
     - name: create and start gold-master container
       lxd_container:
@@ -35,6 +31,19 @@
         wait_for_ipv4_addresses: true
         timeout: 600
 
+    # If we are on the "default" profile, we get only a link-local v6 address, and
+    # http_proxy pointing at lxdbr0. But there is a bug with pipelining in the proxy:
+    # https://github.com/lxc/lxd/issues/2166
+    # Workaround:
+    # http://bnpcs.blogspot.co.uk/2010/11/disable-http-pipelining-in-ubuntu.html
+
+    - name: disable pipelining for apt-get
+      delegate_to: gold-master
+      copy:
+        content: |
+          Acquire::http::Pipeline-Depth "0";
+        dest: /etc/apt/apt.conf.d/00no-pipeline
+
     # Ansible cannot run in a container unless python2 is present.
     # So we must force it to be installed using raw commands.
     - name: check python is installed in container