diff --git a/shippable.yml b/shippable.yml
index 05c9d322d7e..18b38cd61b3 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -151,6 +151,11 @@ branches:
     - "revert-*-*"
 
 build:
+  pre_ci_boot:
+    image_name: quay.io/ansible/shippable-build-container
+    image_tag: 6.10.4.0
+    pull: true
+    options: --privileged=true --net=bridge
   ci:
     - test/utils/shippable/timing.sh test/utils/shippable/shippable.sh $T
 
diff --git a/test/utils/shippable/shippable.sh b/test/utils/shippable/shippable.sh
index 4141eee87ff..55d68289714 100755
--- a/test/utils/shippable/shippable.sh
+++ b/test/utils/shippable/shippable.sh
@@ -13,7 +13,7 @@ docker images ansible/ansible
 docker images quay.io/ansible/*
 docker ps
 
-for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v '^drydock/' | sed 's/^.* //'); do
+for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/shippable-build-container:' | sed 's/^.* //'); do
     docker rm -f "${container}" || true  # ignore errors
 done