diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index 43671e3a2f7..57227ef307e 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -237,9 +237,10 @@ def build_and_push_one_image(
             "docker buildx build --builder default "
             f"--label build-url={GITHUB_RUN_URL} "
             f"{from_tag_arg}"
-            f"--build-arg BUILDKIT_INLINE_CACHE=1 "
             f"--tag {image.repo}:{version_string} "
             f"--cache-from type=registry,ref={image.repo}:{version_string} "
+            f"--cache-from type=registry,ref={image.repo}:latest "
+            f"--cache-to type=inline,mode=max "
             f"{push_arg}"
             f"--progress plain {image.full_path}"
         )
diff --git a/tests/ci/docker_test.py b/tests/ci/docker_test.py
index 0d1c554026f..8a0c4a0dfce 100644
--- a/tests/ci/docker_test.py
+++ b/tests/ci/docker_test.py
@@ -124,8 +124,9 @@ class TestDockerImageCheck(unittest.TestCase):
         self.assertIn(
             f"docker buildx build --builder default --label build-url={GITHUB_RUN_URL} "
             "--build-arg FROM_TAG=version "
-            "--build-arg BUILDKIT_INLINE_CACHE=1 --tag name:version --cache-from "
-            "type=registry,ref=name:version --push --progress plain path",
+            "--tag name:version --cache-from type=registry,ref=name:version "
+            "--cache-from type=registry,ref=name:latest "
+            "--cache-to type=inline,mode=max --push --progress plain path",
             mock_popen.call_args.args,
         )
         self.assertTrue(result)
@@ -141,8 +142,9 @@ class TestDockerImageCheck(unittest.TestCase):
         self.assertIn(
             f"docker buildx build --builder default --label build-url={GITHUB_RUN_URL} "
             "--build-arg FROM_TAG=version2 "
-            "--build-arg BUILDKIT_INLINE_CACHE=1 --tag name:version2 --cache-from "
-            "type=registry,ref=name:version2 --progress plain path",
+            "--tag name:version2 --cache-from type=registry,ref=name:version2 "
+            "--cache-from type=registry,ref=name:latest "
+            "--cache-to type=inline,mode=max --progress plain path",
             mock_popen.call_args.args,
         )
         self.assertTrue(result)
@@ -157,8 +159,9 @@ class TestDockerImageCheck(unittest.TestCase):
         mock_machine.assert_not_called()
         self.assertIn(
             f"docker buildx build --builder default --label build-url={GITHUB_RUN_URL} "
-            "--build-arg BUILDKIT_INLINE_CACHE=1 --tag name:version2 --cache-from "
-            "type=registry,ref=name:version2 --progress plain path",
+            "--tag name:version2 --cache-from type=registry,ref=name:version2 "
+            "--cache-from type=registry,ref=name:latest "
+            "--cache-to type=inline,mode=max --progress plain path",
             mock_popen.call_args.args,
         )
         self.assertFalse(result)