diff --git a/.github/workflows/generic_test.yml b/.github/workflows/generic_test.yml
index fcedb9fc..a96b169a 100644
--- a/.github/workflows/generic_test.yml
+++ b/.github/workflows/generic_test.yml
@@ -34,9 +34,14 @@ jobs:
           path: /tmp/.buildx-cache
           key: cache-buildx-${{ inputs.cache-key }}
 
+      # Configures buildx to use `docker-container` driver,
+      # Ensures consistent BuildKit version (not coupled to Docker Engine),
+      # and increased compatibility of the build cache vs mixing buildx drivers.
+      - name: 'Set up Docker Buildx'
+        uses: docker/setup-buildx-action@v2.4.0
+
       # Importing from the cache should create the image within approx 30 seconds:
-      # Earlier `buildx` + `qemu` steps are not needed as no cache is exported,
-      # and only a single platform (AMD64) is loaded:
+      # NOTE: `qemu` step is not needed as we only test for AMD64.
       - name: 'Build AMD64 image from cache'
         uses: docker/build-push-action@v4.0.0
         with: