diff --git a/.github/workflows/publish-images.yml b/.github/workflows/publish-images.yml
index a442e818..6a203927 100644
--- a/.github/workflows/publish-images.yml
+++ b/.github/workflows/publish-images.yml
@@ -41,3 +41,6 @@ jobs:
         with:
           files: ./docker-bake.hcl
           push: ${{ github.event_name == 'push' && startsWith( steps.extract_branch.outputs.branch , 'deployment' ) }}
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 74df0a9d..94c604e2 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,16 @@
 group "default" {
-  targets = ["auto-operation", "external", "internal", "multicaster", "positioning", "webrtc-sender", "frontend", "receiver-test", "logviewer"]
+  targets = [
+    "auto-operation",
+    "external",
+    "internal",
+    "json2grpc",
+    "multicaster",
+    "positioning",
+    "webrtc-sender",
+    "frontend",
+    "receiver-test",
+    "logviewer",
+  ]
 }
 
 variable "PREFIX" {
@@ -35,6 +46,12 @@ target "internal" {
     GET_TAG("internal")
   ]
 }
+target "json2grpc" {
+  context = "./backend/json2grpc"
+  tags = [
+    GET_TAG("json2grpc")
+  ]
+}
 
 target "multicaster" {
   context = "./backend/multicaster"