diff --git a/.github/actions/docker-setup/action.yml b/.github/actions/docker-setup/action.yml
index 820f794..774e016 100644
--- a/.github/actions/docker-setup/action.yml
+++ b/.github/actions/docker-setup/action.yml
@@ -14,6 +14,12 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@v1.3.1
+      with:
+        tool-cache: true
+        swap-storage: false
+        large-packages: false
     - name: Read variables
       shell: bash
       run: |
diff --git a/.github/workflows/publish-docker-v2.yml b/.github/workflows/publish-docker-v2.yml
index f047b23..1f30fba 100644
--- a/.github/workflows/publish-docker-v2.yml
+++ b/.github/workflows/publish-docker-v2.yml
@@ -10,6 +10,11 @@ on:
     tags:
       - 'v*'
 
+# Limit the concurrency of entire workflow runs for a specific branch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_base_environment_docker_image:
     runs-on: ubuntu-latest
@@ -111,7 +116,8 @@ jobs:
             ALLTALK_DIR=${{ env.ALLTALK_DIR }}
             DEEPSPEED_VERSION=${{ env.DEEPSPEED_VERSION }}
             DOCKER_TAG=${{ env.DOCKER_TAG }}
+            GITHUB_REPOSITORY=${{ env.DOCKERHUB_USERNAME }}/
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPO_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPO_NAME }}:buildcache,mode=max
\ No newline at end of file
+          cache-from: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPO_NAME }}:buildcache-${{ matrix.tts }}
+          cache-to: type=registry,ref=${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_REPO_NAME }}:buildcache-${{ matrix.tts }},mode=max
\ No newline at end of file