diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index a173bd0..78d3cbc 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -292,7 +292,7 @@ jobs:
           flavor: latest=false
           tags: |
             type=sha,prefix=
-            type=raw,value=${{ needs.meta.outputs.dev_suffix }}-${{ needs.meta.outputs.base_version }}
+            type=raw,value=${{ needs.meta.outputs.base_version }}${{ needs.meta.outputs.dev_suffix }}
             type=raw,value=${{ needs.meta.outputs.dev_suffix }}
 
       - name: Login to the docker registry
@@ -310,8 +310,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:${{ needs.meta.outputs.dev_suffix }}-buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:${{ needs.meta.outputs.dev_suffix }}-buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache${{ needs.meta.outputs.dev_suffix }}
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache${{ needs.meta.outputs.dev_suffix }},mode=max
 
   release-dev:
     runs-on: