diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml
index fb5a2edffd..1eb51f9eb4 100644
--- a/.github/workflows/_e2e_tests.yml
+++ b/.github/workflows/_e2e_tests.yml
@@ -21,20 +21,20 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Build and push
-        uses: docker/bake-action@v2
-        with:
-          load: true
-          files: |
-            docker-compose-datasets-server.yml
-          set: |
-            *.cache-from=type=gha
-            *.cache-to=type=gha
-          workdir: ./tools
+      # -
+      #   name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v2
+      # -
+      #   name: Build and push
+      #   uses: docker/bake-action@v2
+      #   with:
+      #     load: true
+      #     files: |
+      #       docker-compose-datasets-server.yml
+      #     set: |
+      #       *.cache-from=type=gha
+      #       *.cache-to=type=gha
+      #     workdir: ./tools
       -
         name: Launch the services (the images should have been build in the previous step)
         env:
diff --git a/tools/docker-compose-datasets-server.yml b/tools/docker-compose-datasets-server.yml
index 82cd50fcce..2998487fd3 100644
--- a/tools/docker-compose-datasets-server.yml
+++ b/tools/docker-compose-datasets-server.yml
@@ -22,6 +22,10 @@ services:
     build:
       context: ..
       dockerfile: services/admin/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_SERVICE_ADMIN?IMAGE_SERVICE_ADMIN env var must be provided}
     extends:
       file: docker-compose-base.yml
@@ -49,6 +53,10 @@ services:
     build:
       context: ..
       dockerfile: services/api/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_SERVICE_API?IMAGE_SERVICE_API env var must be provided}
     extends:
       file: docker-compose-base.yml
@@ -74,6 +82,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     volumes:
       - splits-datasets-cache:${HF_DATASETS_CACHE-/datasets-cache}:rw
@@ -91,6 +103,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     volumes:
       - splits-datasets-cache:${HF_DATASETS_CACHE-/datasets-cache}:rw
@@ -108,6 +124,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     volumes:
       - splits-datasets-cache:${HF_DATASETS_CACHE-/datasets-cache}:rw
@@ -125,6 +145,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     volumes:
       - assets:${ASSETS_STORAGE_DIRECTORY-/assets}:rw
@@ -152,6 +176,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     volumes:
       - parquet-datasets-cache:${HF_DATASETS_CACHE-/datasets-cache}:rw
@@ -177,6 +205,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     extends:
       file: docker-compose-base.yml
@@ -190,6 +222,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     extends:
       file: docker-compose-base.yml
@@ -203,6 +239,10 @@ services:
     build:
       context: ..
       dockerfile: workers/datasets_based/Dockerfile
+      cache-from:
+        - type=gha
+      cache-to:
+        - type=gha
     # image: ${IMAGE_WORKER_DATASETS_BASED?IMAGE_WORKER_DATASETS_BASED env var must be provided}
     extends:
       file: docker-compose-base.yml