diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a57dc96b..e3de3f1b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -6,9 +6,9 @@ function build_test_container {
     #               resolved instead of podman we need to use buildah directly,
     #               hence this awful if clause.
     if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
-        sudo buildah bud -t docker.io/kuryr/demo -f Dockerfile .
+        sudo buildah bud -t quay.io/kuryr/demo -f Dockerfile .
     else
-        docker build -t kuryr/demo . -f Dockerfile
+        docker build -t quay.io/kuryr/demo . -f Dockerfile
     fi
     popd
 }
diff --git a/kuryr_tempest_plugin/tests/scenario/base.py b/kuryr_tempest_plugin/tests/scenario/base.py
index cba8e1ad..8a1ef1f6 100644
--- a/kuryr_tempest_plugin/tests/scenario/base.py
+++ b/kuryr_tempest_plugin/tests/scenario/base.py
@@ -166,7 +166,7 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
                 name=np_name, namespace=np_namespace)
 
     @classmethod
-    def create_pod(cls, name=None, labels=None, image='kuryr/demo',
+    def create_pod(cls, name=None, labels=None, image='quay.io/kuryr/demo',
                    namespace="default", annotations=None, wait_for_status=True,
                    affinity=None):
         if not name:
diff --git a/test_container/Dockerfile.builder b/test_container/Dockerfile.builder
index 8826f93a..f051019e 100644
--- a/test_container/Dockerfile.builder
+++ b/test_container/Dockerfile.builder
@@ -87,8 +87,8 @@ RUN set -ex \
 		busybox \
 	&& ./busybox --help \
 	&& mkdir -p rootfs/bin \
-	&& ln -vL busybox rootfs/bin/ \
-	&& chroot rootfs /bin/busybox --install /bin
+	&& cp busybox rootfs/bin/ \
+	&& chroot rootfs /bin/busybox --install -s /bin
 
 # grab a simplified getconf port from Alpine we can statically compile
 RUN set -x \
diff --git a/test_container/README.rst b/test_container/README.rst
index 82e88b06..71042d14 100644
--- a/test_container/README.rst
+++ b/test_container/README.rst
@@ -2,16 +2,16 @@
 Kuryr Testing container infrastructure
 ======================================
 
-This directory is the official source for building Docker hub's kuryr/demo
-images.
+This directory is the official source for building Quay.io kuryr/demo images.
 
 The build consists on two parts:
 
+
 Builder container
 -----------------
 
-The builder container is based on the musl compiled Alpine distribution. In the
-process of building the image, it downloads and compiles:
+The builder container is based on the `musl`_ compiled Alpine distribution. In
+the process of building the image, it downloads and compiles:
 
 * busybox
 * musl
@@ -21,14 +21,14 @@ It also includes golang so that we can use it in our test web server:
 
 * server.go
 
-Everything that is to be included in the kuryr/demo image is put in::
-
-    /usr/src/busybox/rootfs
+Everything that is to be included in the kuryr/demo image is put in
+``/usr/src/busybox/rootfs``.
 
 The reason for this is that this build is based on Docker's busybox build
 system and the rootfs won't have any library, so all you want to add must be
 statically compiled there.
 
+
 kuryr/demo container
 --------------------
 
@@ -42,6 +42,7 @@ This is the actual container used in the tests. It includes:
   that includes the hostname, so it can be used to see which pod replies to a
   service request.
 
+
 When and how to build
 ---------------------
 
@@ -53,14 +54,18 @@ app version of something in kuryr/demo or add another tool like bind9 dig.
 
 The way to do this is::
 
-    sudo ./mkrootfs.sh
+.. code-block:: console
+
+   $ sudo ./mkrootfs.sh
 
 
 kuryr/demo
 ~~~~~~~~~~
 
 Everytime you want to run the tests, you should build the kuryr/demo container
-locally to avoid pulls from dockerhub to make sure you run the latest
+locally to avoid pulls from quay.io to make sure you run the latest
 authoritative version.
 
 Note that the kuryr-tempest-plugin devstack will build it for you.
+
+.. _musl: https://musl.libc.org
diff --git a/test_container/mkrootfs.sh b/test_container/mkrootfs.sh
index 4c9a2392..ae5fcfe9 100755
--- a/test_container/mkrootfs.sh
+++ b/test_container/mkrootfs.sh
@@ -12,4 +12,4 @@ docker rm ${BUILDER_NAME}
 chmod +s rootfs/bin/busybox
 tar -J -f rootfs.tar.xz --numeric-owner --exclude='dev/*' -C rootfs -c .
 rm -fr rootfs
-docker build -t kuryr/demo . -f Dockerfile
+docker build -t quay.io/kuryr/demo . -f Dockerfile
diff --git a/test_container/rootfs.tar.xz b/test_container/rootfs.tar.xz
index f627f8cc..598788d0 100644
Binary files a/test_container/rootfs.tar.xz and b/test_container/rootfs.tar.xz differ