diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index c11c067da..832f41048 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -24,7 +24,6 @@ jobs:
     env:
       COMPOSE_DOCKER_CLI_BUILD: 1
       DOCKER_BUILDKIT: 1
-      BUILDKIT_INLINE_CACHE: 1
 
     steps:
       - name: Extract branch name
@@ -34,14 +33,20 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 512
+          swap-size-mb: 1024
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+
       - name: Configure
         run: |
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           docker --version
-          docker compose --version
+          docker compose version
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -91,7 +96,6 @@ jobs:
     env:
       COMPOSE_DOCKER_CLI_BUILD: 1
       DOCKER_BUILDKIT: 1
-      BUILDKIT_INLINE_CACHE: 1
 
     steps:
       - name: Extract branch name
@@ -101,14 +105,20 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 512
+          swap-size-mb: 1024
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+
       - name: Configure
         run: |
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           docker --version
-          docker compose --version
+          docker compose version
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
diff --git a/docker-compose.yml b/docker-compose.yml
index a69a289f8..5d16f365e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,13 +14,13 @@ x-build-params: &build-params
     DOCKER_USER: ${DOCKER_USER:-acore}
     BUILDKIT_INLINE_CACHE: 1
   cache_from:
-    - acore/ac-wotlk-authserver:${DOCKER_IMAGE_TAG:-master}
-    - acore/ac-wotlk-authserver-local:${DOCKER_IMAGE_TAG:-master}
-    - acore/ac-wotlk-worldserver:${DOCKER_IMAGE_TAG:-master}
-    - acore/ac-wotlk-worldserver-local:${DOCKER_IMAGE_TAG:-master}
-    - acore/ac-wotlk-dev-server:${DOCKER_IMAGE_TAG:-master}
-    - acore/ac-wotlk-tools:${DOCKER_IMAGE_TAG:-master}
-    #- acore/ac-wotlk-client-data-server:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-authserver:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-authserver-local:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-worldserver:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-worldserver-local:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-dev-server:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-tools:${DOCKER_IMAGE_TAG:-master}
+    - registry.hub.docker.com/acore/ac-wotlk-client-data:${DOCKER_IMAGE_TAG:-master}
 
 x-ac-shared-conf: &ac-shared-conf
   <<: *networks