diff --git a/.github/workflows/klipper_moonraker_multiarch.yml b/.github/workflows/klipper_moonraker_multiarch.yml
index 957b4c7..7b6aecf 100644
--- a/.github/workflows/klipper_moonraker_multiarch.yml
+++ b/.github/workflows/klipper_moonraker_multiarch.yml
@@ -53,6 +53,7 @@ jobs:
           # Set output parameters.
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=base_tag::${BASE_TAG}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
@@ -79,5 +80,5 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           push: true
           tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=registry,ref=${{ steps.prep.outputs.docker_image }}:latest
+          cache-from: type=registry,ref=${{ steps.prep.outputs.docker_image }}:${{ steps.prep.outputs.base_tag }}
           cache-to: type=inline
diff --git a/config/moonraker.conf b/config/moonraker.conf
index 7c3bd99..6f2f97a 100755
--- a/config/moonraker.conf
+++ b/config/moonraker.conf
@@ -9,13 +9,13 @@ database_path: /home/klippy/.moonraker/database
 cors_domains:
   http://*.local
 trusted_clients:
- 10.0.0.0/8
- 127.0.0.0/8
- 169.254.0.0/16
- 172.16.0.0/12
- 192.168.0.0/16
- FE80::/10
- ::1/128
+  10.0.0.0/8
+  127.0.0.0/8
+  169.254.0.0/16
+  172.16.0.0/12
+  192.168.0.0/16
+  FE80::/10
+  ::1/128
 
 [octoprint_compat]