diff --git a/.cirrus.yml b/.cirrus.yml
index 88c8f97f..5d79dac0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -54,9 +54,13 @@ multi_arch_build_task:
     - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
   setup_script:
     - docker run -t --rm --privileged tonistiigi/binfmt --install all
-    - docker buildx create --name multibuilder
+    - docker buildx create --name multibuilder --driver docker-container
     - docker buildx use multibuilder
+    - echo "Buildx version:"
     - docker buildx inspect --bootstrap
+    - echo "Docker version:"
+    - docker --version
+    - docker buildx version
   build_script:
     - echo "Build the ${STAGING_IMAGE_NAME}:${tag} image supporting two architectures, linux/amd64 and linux/arm64"
     - docker buildx build --platform linux/amd64,linux/arm64 --tag "${STAGING_IMAGE_NAME}:${tag}" --push ${version}