diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 6a82c9e..5e6f024 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/      
-          key: build-cheapsdo
+          key: build-cheapsdo-firmware
           restore-keys: audit-cheapsdo
       - run: cd firmware && CARGO_HOME=~/.cargo cargo build --target thumbv7m-none-eabi --release
 
@@ -32,7 +32,8 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/      
-          key: build-cheapsdo
+          key: build-cheapsdo-linux
+          restore-keys: build-cheapsdo-firmware
       - run: cd hostsoftware && CARGO_HOME=~/.cargo cargo build --release
 
   build-windows:
@@ -50,7 +51,8 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/      
-          key: build-cheapsdo
+          key: build-cheapsdo-windows
+          restore-keys: build-cheapsdo-linux
       - run: cd hostsoftware && CARGO_HOME=~/.cargo cargo build --target x86_64-pc-windows-gnu --release
 
   build-appimage:
@@ -68,5 +70,6 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/      
-          key: build-cheapsdo
+          key: build-cheapsdo-appimage
+          restore-keys: build-cheapsdo-linux
       - run: cd hostsoftware && CARGO_HOME=~/.cargo PATH=$PATH:$CARGO_HOME/bin x build -r --format appimage
\ No newline at end of file