diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml
index 96ec76e..de4d7cc 100644
--- a/.gitea/workflows/gentoo-utils.yml
+++ b/.gitea/workflows/gentoo-utils.yml
@@ -16,7 +16,7 @@ jobs:
     continue-on-error: true
     steps:
       - name: Restore git cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
@@ -94,12 +94,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: Build
-        run: |
-          meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
-          meson compile -C build
-
-      - name: Cache Build + Subprojects
+      - name: Build Cache Setup
         uses: actions/cache@v5
         with:
           path: |
@@ -107,6 +102,12 @@ jobs:
             build
           key: build-${{ gitea.repository }}-${{ gitea.sha }}
 
+      - name: Build
+        run: |
+          meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
+          meson compile -C build
+
+
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
@@ -127,7 +128,7 @@ jobs:
           path: |
             subprojects
             build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
+          key: build-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: test
         run: |
@@ -154,7 +155,7 @@ jobs:
           path: |
             subprojects
             build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
+          key: build-${{ gitea.repository }}-${{ gitea.sha }}
       # FIXME: Get rid of this step when portage has fixes merged?
       # needed because portage has fixes upstream we need that arent stable yet
       - name: Checkout tip of portage
@@ -189,7 +190,7 @@ jobs:
           path: |
             subprojects
             build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
+          key: build-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: Check Formatting
         run: |
@@ -212,7 +213,7 @@ jobs:
           path: |
             subprojects
             build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
+          key: build-${{ gitea.repository }}-${{ gitea.sha }}
 
       - name: Build Documentation
         run: |