diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 685eee6a8..26988ad5d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -35,15 +35,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - name: Cache Docker layers
-#         uses: actions/cache@v2
-#         with:
-#           path: /tmp/.buildx-cache
-#           # Key is named differently to avoid collision
-#           key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
-#           restore-keys: |
-#             ${{ runner.os }}-multi-buildx
-
       - name: Build and push Docker image (scrypted-common)
         uses: docker/build-push-action@v2
         with:
@@ -55,8 +46,8 @@ jobs:
           tags: |
             koush/scrypted-common:latest
             ghcr.io/koush/scrypted-common:latest
-#           cache-from: type=local,src=/tmp/.buildx-cache
-#           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push Docker image (scrypted)
         uses: docker/build-push-action@v2
@@ -69,11 +60,5 @@ jobs:
           tags: |
             koush/scrypted:latest
             ghcr.io/koush/scrypted:latest
-#           cache-from: type=local,src=/tmp/.buildx-cache
-#           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
-
-      # prevent cache from growing forever
-#       - name: Move cache
-#         run: |
-#           rm -rf /tmp/.buildx-cache
-#           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max