diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index b9ff5c3d..7e2b488e 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -17,6 +17,10 @@ jobs:
         with:
           ref: develop
 
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -28,10 +32,6 @@ jobs:
         with:
           platforms: all
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5
@@ -43,6 +43,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/plex-meta-manager:develop
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Send Discord Commit Notification
         uses: meisnate12/discord-notifications@master
diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
index aa714c5b..c320bf03 100644
--- a/.github/workflows/latest.yml
+++ b/.github/workflows/latest.yml
@@ -13,6 +13,10 @@ jobs:
       - name: Check Out Repo
         uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -24,10 +28,6 @@ jobs:
         with:
           platforms: all
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5
@@ -37,6 +37,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/plex-meta-manager:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Discord Success Notification
         uses: meisnate12/discord-notifications@master
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 02618a3e..56641304 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -17,6 +17,10 @@ jobs:
         with:
           ref: nightly
 
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -28,10 +32,6 @@ jobs:
         with:
           platforms: all
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5
@@ -43,6 +43,8 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/plex-meta-manager:nightly
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Send Discord Commit Notification
         uses: meisnate12/discord-notifications@master