diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 65b4fbe3a2..d40792e28a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -45,8 +45,8 @@ jobs:
             ${{ steps.metalocal.outputs.tags }}
 
           labels: ${{ steps.metalocal.outputs.labels }}
-          cache-from: type=registry,ref=registry.wimill.xyz/windmilllabs/windmill:buildcache
-          cache-to: type=registry,ref=registry.wimill.xyz/windmilllabs/windmill:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
 
       - name: Docker meta
         if: github.event_name != 'pull_request'
@@ -79,5 +79,5 @@ jobs:
             ${{ steps.meta.outputs.tags }}
 
           labels: ${{ steps.metalocal.outputs.labels }}
-          cache-from: type=registry,ref=registry.wimill.xyz/windmilllabs/windmill:buildcache
-          cache-to: type=registry,ref=registry.wimill.xyz/windmilllabs/windmill:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
diff --git a/.github/workflows/lsp_on_release.yml b/.github/workflows/lsp_on_release.yml
index 3bd2dd8a70..394e33f5a4 100644
--- a/.github/workflows/lsp_on_release.yml
+++ b/.github/workflows/lsp_on_release.yml
@@ -1,3 +1,7 @@
+env:
+  LOCAL_REGISTRY: registry.wimill.xyz
+  IMAGE_NAME: ${{ github.repository }}
+
 name: Publish LSP Server
 on:
   push:
@@ -20,7 +24,7 @@ jobs:
         id: metalocal
         uses: docker/metadata-action@v4
         with:
-          images: registry.wimill.xyz/windmilllabs/lsp
+          images: ${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}-lsp
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
@@ -33,5 +37,5 @@ jobs:
           push: true
           tags: ${{ steps.metalocal.outputs.tags }}
           labels: ${{ steps.metalocal.outputs.labels }}
-          cache-from: type=registry,ref=registry.wimill.xyz/windmilllabs/lsp:buildcache
-          cache-to: type=registry,ref=registry.wimill.xyz/windmilllabs/lsp:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}-lsp:buildcache
+          cache-to: type=registry,ref=${{ env.LOCAL_REGISTRY }}/${{ env.IMAGE_NAME }}-lsp:buildcache,mode=max