diff --git a/mesh/mesh-light.yaml b/mesh/mesh-light.yaml
index 9e672ede..e1b6da04 100644
--- a/mesh/mesh-light.yaml
+++ b/mesh/mesh-light.yaml
@@ -1,5 +1,5 @@
 defaultRegistry: ghcr.io/streamx-dev/streamx-blueprints
-defaultImageTag: 2.0.0-jvm
+defaultImageTag: 2.0.4-jvm
 
 sources:
   pim:
diff --git a/mesh/mesh.yaml b/mesh/mesh.yaml
index 175fa486..6970f97d 100644
--- a/mesh/mesh.yaml
+++ b/mesh/mesh.yaml
@@ -1,5 +1,5 @@
 defaultRegistry: ghcr.io/streamx-dev/streamx-blueprints
-defaultImageTag: 2.0.0-jvm
+defaultImageTag: 2.0.4-jvm
 
 sources:
   github:
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/composition-engine-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/composition-engine-processing-service/2.0.4-jvm.json
similarity index 67%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/composition-engine-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/composition-engine-processing-service/2.0.4-jvm.json
index 7b2b7e23..42fdaf9a 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/composition-engine-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/composition-engine-processing-service/2.0.4-jvm.json
@@ -1,39 +1,39 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/composition-engine-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/composition-engine-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
       "name": "compositions",
-      "defaultSchemaId": "Composition_AVROSchema_bbf68f92760c44c80bb9e99920808ce28a13bd7b",
+      "defaultSchemaId": "Composition_AVROSchema_afd8af57a5cb908807474fe35700ee15543c015b",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "layouts",
-      "defaultSchemaId": "Layout_AVROSchema_1022ea40d231155594d21d20cb51929c7165f11f",
+      "defaultSchemaId": "Layout_AVROSchema_8e05581e5d57b0d4d0a4ffea8aec65714daa631b",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "incoming-page-compose-requests",
-      "defaultSchemaId": "PageComposeRequest_AVROSchema_9739fd8cbb16d26030fd1ef6b75b79cacbb11b03",
+      "defaultSchemaId": "PageComposeRequest_AVROSchema_3cf80f80b1b6571632fb372c972714dde3617105",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
       "name": "outgoing-page-compose-requests",
-      "defaultSchemaId": "PageComposeRequest_AVROSchema_9739fd8cbb16d26030fd1ef6b75b79cacbb11b03",
+      "defaultSchemaId": "PageComposeRequest_AVROSchema_3cf80f80b1b6571632fb372c972714dde3617105",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "pages",
-      "defaultSchemaId": "Page_AVROSchema_b0b1294e06f8ab10892594723d6db7b22bae4d40",
+      "defaultSchemaId": "Page_AVROSchema_b2406fb7f3956ed6535681337ca1bed30ba499bc",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Layout_AVROSchema_1022ea40d231155594d21d20cb51929c7165f11f": {
+    "Page_AVROSchema_b2406fb7f3956ed6535681337ca1bed30ba499bc": {
       "type": "record",
-      "name": "Layout",
+      "name": "Page",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -42,9 +42,9 @@
         }
       ]
     },
-    "Page_AVROSchema_b0b1294e06f8ab10892594723d6db7b22bae4d40": {
+    "Layout_AVROSchema_8e05581e5d57b0d4d0a4ffea8aec65714daa631b": {
       "type": "record",
-      "name": "Page",
+      "name": "Layout",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -53,7 +53,7 @@
         }
       ]
     },
-    "PageComposeRequest_AVROSchema_9739fd8cbb16d26030fd1ef6b75b79cacbb11b03": {
+    "PageComposeRequest_AVROSchema_3cf80f80b1b6571632fb372c972714dde3617105": {
       "type": "record",
       "name": "PageComposeRequest",
       "namespace": "dev.streamx.blueprints.composition",
@@ -68,7 +68,7 @@
         }
       ]
     },
-    "Composition_AVROSchema_bbf68f92760c44c80bb9e99920808ce28a13bd7b": {
+    "Composition_AVROSchema_afd8af57a5cb908807474fe35700ee15543c015b": {
       "type": "record",
       "name": "Composition",
       "namespace": "dev.streamx.blueprints.data",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/data-collector-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/data-collector-processing-service/2.0.4-jvm.json
similarity index 64%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/data-collector-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/data-collector-processing-service/2.0.4-jvm.json
index fb1ef9d8..ede42ba2 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/data-collector-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/data-collector-processing-service/2.0.4-jvm.json
@@ -1,27 +1,27 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/data-collector-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/data-collector-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
       "name": "data",
-      "defaultSchemaId": "Data_AVROSchema_2a7cbb712e9b101ff9dc6167c76334e38d0aa71a",
+      "defaultSchemaId": "Data_AVROSchema_b6807e703af398df161220c621442f3e9f2acdae",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
       "name": "web-resources",
-      "defaultSchemaId": "WebResource_AVROSchema_ca473425346e07ac9a60bbc01eeaba7a872d37ce",
+      "defaultSchemaId": "WebResource_AVROSchema_5e9e26363c51912dddacc09aaf48d47b239f8dbc",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "collected-data",
-      "defaultSchemaId": "Data_AVROSchema_2a7cbb712e9b101ff9dc6167c76334e38d0aa71a",
+      "defaultSchemaId": "Data_AVROSchema_b6807e703af398df161220c621442f3e9f2acdae",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Data_AVROSchema_2a7cbb712e9b101ff9dc6167c76334e38d0aa71a": {
+    "Data_AVROSchema_b6807e703af398df161220c621442f3e9f2acdae": {
       "type": "record",
       "name": "Data",
       "namespace": "dev.streamx.blueprints.data",
@@ -32,7 +32,7 @@
         }
       ]
     },
-    "WebResource_AVROSchema_ca473425346e07ac9a60bbc01eeaba7a872d37ce": {
+    "WebResource_AVROSchema_5e9e26363c51912dddacc09aaf48d47b239f8dbc": {
       "type": "record",
       "name": "WebResource",
       "namespace": "dev.streamx.blueprints.data",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/image-optimization-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/image-optimization-processing-service/2.0.4-jvm.json
similarity index 63%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/image-optimization-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/image-optimization-processing-service/2.0.4-jvm.json
index 781ec8c5..c5706265 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/image-optimization-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/image-optimization-processing-service/2.0.4-jvm.json
@@ -1,34 +1,34 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/image-optimization-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/image-optimization-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
-      "name": "incoming-assets",
-      "defaultSchemaId": "Asset_AVROSchema_7b9777c1cf366c0f7b95dee22fa886e571a78fe4",
+      "name": "incoming-pages",
+      "defaultSchemaId": "Page_AVROSchema_692a4be2160a8fd0652bb2d5504c674b3484014d",
       "connector": "smallrye-pulsar"
     },
     {
-      "name": "incoming-pages",
-      "defaultSchemaId": "Page_AVROSchema_7941bfd98de2b3924db1ea9f28513f7adc82f1e0",
+      "name": "incoming-assets",
+      "defaultSchemaId": "Asset_AVROSchema_c63c289a2b77e5139c6760bacd226683da8628cd",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
-      "name": "optimized-assets",
-      "defaultSchemaId": "Asset_AVROSchema_7b9777c1cf366c0f7b95dee22fa886e571a78fe4",
+      "name": "outgoing-pages",
+      "defaultSchemaId": "Page_AVROSchema_692a4be2160a8fd0652bb2d5504c674b3484014d",
       "connector": "smallrye-pulsar"
     },
     {
-      "name": "outgoing-pages",
-      "defaultSchemaId": "Page_AVROSchema_7941bfd98de2b3924db1ea9f28513f7adc82f1e0",
+      "name": "optimized-assets",
+      "defaultSchemaId": "Asset_AVROSchema_c63c289a2b77e5139c6760bacd226683da8628cd",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Asset_AVROSchema_7b9777c1cf366c0f7b95dee22fa886e571a78fe4": {
+    "Page_AVROSchema_692a4be2160a8fd0652bb2d5504c674b3484014d": {
       "type": "record",
-      "name": "Asset",
+      "name": "Page",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -37,9 +37,9 @@
         }
       ]
     },
-    "Page_AVROSchema_7941bfd98de2b3924db1ea9f28513f7adc82f1e0": {
+    "Asset_AVROSchema_c63c289a2b77e5139c6760bacd226683da8628cd": {
       "type": "record",
-      "name": "Page",
+      "name": "Asset",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/indexables-producer-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/indexables-producer-processing-service/2.0.4-jvm.json
similarity index 68%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/indexables-producer-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/indexables-producer-processing-service/2.0.4-jvm.json
index db255139..2b4e3637 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/indexables-producer-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/indexables-producer-processing-service/2.0.4-jvm.json
@@ -1,53 +1,45 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/indexables-producer-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/indexables-producer-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
-      "name": "pages",
-      "defaultSchemaId": "Page_AVROSchema_3d5e7d1af2ba811345a0b247eb748f9beeba228a",
+      "name": "fragments",
+      "defaultSchemaId": "Fragment_AVROSchema_f66d929dec9b1f2cad65d110218fb7d33f2c2b34",
       "connector": "smallrye-pulsar"
     },
     {
-      "name": "fragments",
-      "defaultSchemaId": "Fragment_AVROSchema_59e7d99f5417e111e78e4f3827b2062b6574ad01",
+      "name": "pages",
+      "defaultSchemaId": "Page_AVROSchema_bb827a955569628e9e5d692be490df1fabb11001",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
-      "name": "indexable-resources",
-      "defaultSchemaId": "IndexableResource_AVROSchema_b33af00d3e52a9a48a5a8e1da23089265e8e4ed8",
+      "name": "indexable-resource-fragments",
+      "defaultSchemaId": "IndexableResourceFragment_AVROSchema_3140c736d024f2a4de0b9228419fd6bf9f8f7720",
       "connector": "smallrye-pulsar"
     },
     {
-      "name": "indexable-resource-fragments",
-      "defaultSchemaId": "IndexableResourceFragment_AVROSchema_116a56cbd8cf121f086327639ab0fcee81283155",
+      "name": "indexable-resources",
+      "defaultSchemaId": "IndexableResource_AVROSchema_fb4a0780e2e58223d88c6726dc71f73f55f0cb99",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "IndexableResource_AVROSchema_b33af00d3e52a9a48a5a8e1da23089265e8e4ed8": {
+    "IndexableResourceFragment_AVROSchema_3140c736d024f2a4de0b9228419fd6bf9f8f7720": {
       "type": "record",
-      "name": "IndexableResource",
+      "name": "IndexableResourceFragment",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
-        {
-          "name": "fragmentKeys",
-          "type": {
-            "type": "array",
-            "items": "string",
-            "java-class": "java.util.Set"
-          }
-        },
         {
           "name": "content",
           "type": "bytes"
         }
       ]
     },
-    "Fragment_AVROSchema_59e7d99f5417e111e78e4f3827b2062b6574ad01": {
+    "Page_AVROSchema_bb827a955569628e9e5d692be490df1fabb11001": {
       "type": "record",
-      "name": "Fragment",
+      "name": "Page",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -56,9 +48,9 @@
         }
       ]
     },
-    "Page_AVROSchema_3d5e7d1af2ba811345a0b247eb748f9beeba228a": {
+    "Fragment_AVROSchema_f66d929dec9b1f2cad65d110218fb7d33f2c2b34": {
       "type": "record",
-      "name": "Page",
+      "name": "Fragment",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -67,11 +59,19 @@
         }
       ]
     },
-    "IndexableResourceFragment_AVROSchema_116a56cbd8cf121f086327639ab0fcee81283155": {
+    "IndexableResource_AVROSchema_fb4a0780e2e58223d88c6726dc71f73f55f0cb99": {
       "type": "record",
-      "name": "IndexableResourceFragment",
+      "name": "IndexableResource",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
+        {
+          "name": "fragmentKeys",
+          "type": {
+            "type": "array",
+            "items": "string",
+            "java-class": "java.util.Set"
+          }
+        },
         {
           "name": "content",
           "type": "bytes"
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/json-aggregator-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/json-aggregator-processing-service/2.0.4-jvm.json
similarity index 61%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/json-aggregator-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/json-aggregator-processing-service/2.0.4-jvm.json
index c7500bca..c8f3ed86 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/json-aggregator-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/json-aggregator-processing-service/2.0.4-jvm.json
@@ -1,32 +1,32 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/json-aggregator-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/json-aggregator-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
       "name": "data",
-      "defaultSchemaId": "Data_AVROSchema_ec296f1a28dd9ebf1d7ccfea59cbe8c44c860f4b",
+      "defaultSchemaId": "Data_AVROSchema_3148606aa307e1015e63eccbc69ad675190acf10",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "multivalued-data",
-      "defaultSchemaId": "Data_AVROSchema_ec296f1a28dd9ebf1d7ccfea59cbe8c44c860f4b",
+      "defaultSchemaId": "Data_AVROSchema_3148606aa307e1015e63eccbc69ad675190acf10",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
       "name": "aggregated-data",
-      "defaultSchemaId": "Data_AVROSchema_ec296f1a28dd9ebf1d7ccfea59cbe8c44c860f4b",
+      "defaultSchemaId": "Data_AVROSchema_3148606aa307e1015e63eccbc69ad675190acf10",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "aggregated-multivalued-data",
-      "defaultSchemaId": "Data_AVROSchema_ec296f1a28dd9ebf1d7ccfea59cbe8c44c860f4b",
+      "defaultSchemaId": "Data_AVROSchema_3148606aa307e1015e63eccbc69ad675190acf10",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Data_AVROSchema_ec296f1a28dd9ebf1d7ccfea59cbe8c44c860f4b": {
+    "Data_AVROSchema_3148606aa307e1015e63eccbc69ad675190acf10": {
       "type": "record",
       "name": "Data",
       "namespace": "dev.streamx.blueprints.data",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/message-converter-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/message-converter-processing-service/2.0.4-jvm.json
similarity index 71%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/message-converter-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/message-converter-processing-service/2.0.4-jvm.json
index 8323890b..3e72c933 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/message-converter-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/message-converter-processing-service/2.0.4-jvm.json
@@ -1,45 +1,45 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/message-converter-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/message-converter-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
       "name": "data",
-      "defaultSchemaId": "Data_AVROSchema_fa58feedd00e07d4c58fd468c4d59f15d8cfae54",
+      "defaultSchemaId": "Data_AVROSchema_e4aded59c10ad1296898b9574816e1627aa78b2f",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
       "name": "indexable-resources",
-      "defaultSchemaId": "IndexableResource_AVROSchema_bc8562b60c746dab7194ae0d400b2b586722c43f",
+      "defaultSchemaId": "IndexableResource_AVROSchema_11918c58b95fd08365ca19951759562c1bea8a9a",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "IndexableResource_AVROSchema_bc8562b60c746dab7194ae0d400b2b586722c43f": {
+    "Data_AVROSchema_e4aded59c10ad1296898b9574816e1627aa78b2f": {
       "type": "record",
-      "name": "IndexableResource",
+      "name": "Data",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
-        {
-          "name": "fragmentKeys",
-          "type": {
-            "type": "array",
-            "items": "string",
-            "java-class": "java.util.Set"
-          }
-        },
         {
           "name": "content",
           "type": "bytes"
         }
       ]
     },
-    "Data_AVROSchema_fa58feedd00e07d4c58fd468c4d59f15d8cfae54": {
+    "IndexableResource_AVROSchema_11918c58b95fd08365ca19951759562c1bea8a9a": {
       "type": "record",
-      "name": "Data",
+      "name": "IndexableResource",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
+        {
+          "name": "fragmentKeys",
+          "type": {
+            "type": "array",
+            "items": "string",
+            "java-class": "java.util.Set"
+          }
+        },
         {
           "name": "content",
           "type": "bytes"
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/opensearch-delivery-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/opensearch-delivery-service/2.0.4-jvm.json
similarity index 70%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/opensearch-delivery-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/opensearch-delivery-service/2.0.4-jvm.json
index d6b4131a..04931119 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/opensearch-delivery-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/opensearch-delivery-service/2.0.4-jvm.json
@@ -1,20 +1,20 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/opensearch-delivery-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/opensearch-delivery-service:2.0.4-jvm",
   "type": "delivery",
   "incoming": [
     {
       "name": "indexable-resources",
-      "defaultSchemaId": "IndexableResource_AVROSchema_29e78cfc6caf7d2f34399b18f9e8a4bf512df193",
+      "defaultSchemaId": "IndexableResource_AVROSchema_718bb518cdb2f5353e5852d29d4ef221ba31f315",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "indexable-resource-fragments",
-      "defaultSchemaId": "IndexableResourceFragment_AVROSchema_a34cc53540189db89335c7561799b98314633798",
+      "defaultSchemaId": "IndexableResourceFragment_AVROSchema_b3513c05053f8cd202519ea5ee40b19cb2a79e5c",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "IndexableResourceFragment_AVROSchema_a34cc53540189db89335c7561799b98314633798": {
+    "IndexableResourceFragment_AVROSchema_b3513c05053f8cd202519ea5ee40b19cb2a79e5c": {
       "type": "record",
       "name": "IndexableResourceFragment",
       "namespace": "dev.streamx.blueprints.data",
@@ -25,7 +25,7 @@
         }
       ]
     },
-    "IndexableResource_AVROSchema_29e78cfc6caf7d2f34399b18f9e8a4bf512df193": {
+    "IndexableResource_AVROSchema_718bb518cdb2f5353e5852d29d4ef221ba31f315": {
       "type": "record",
       "name": "IndexableResource",
       "namespace": "dev.streamx.blueprints.data",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/relay-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/relay-processing-service/2.0.4-jvm.json
similarity index 99%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/relay-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/relay-processing-service/2.0.4-jvm.json
index 1c8d5998..24b6c0c2 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/relay-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/relay-processing-service/2.0.4-jvm.json
@@ -1,5 +1,5 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/relay-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/relay-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/rendering-engine-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/rendering-engine-processing-service/2.0.4-jvm.json
similarity index 84%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/rendering-engine-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/rendering-engine-processing-service/2.0.4-jvm.json
index c1bd943f..5c1e4672 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/rendering-engine-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/rendering-engine-processing-service/2.0.4-jvm.json
@@ -1,12 +1,7 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/rendering-engine-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/rendering-engine-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
-    {
-      "name": "incoming-rendering-requests",
-      "defaultSchemaId": "RenderingRequest_AVROSchema_eb6d2a76294dbec99385016289ab9a1601314eb8",
-      "connector": "smallrye-pulsar"
-    },
     {
       "name": "rendering-contexts",
       "defaultSchemaId": "rendering-contexts",
@@ -14,16 +9,26 @@
     },
     {
       "name": "data",
-      "defaultSchemaId": "Data_AVROSchema_d3653723966482c11272acbbda20a9fb504c8cd8",
+      "defaultSchemaId": "Data_AVROSchema_82b5943c8a36c612a5b3ddaf45b1179e15a549d7",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "renderers",
-      "defaultSchemaId": "Renderer_AVROSchema_0f903180f31eb9946264a126db51787b9c682d1e",
+      "defaultSchemaId": "Renderer_AVROSchema_b8ee334878ad1e259840f80a46da5442a68e23c9",
+      "connector": "smallrye-pulsar"
+    },
+    {
+      "name": "incoming-rendering-requests",
+      "defaultSchemaId": "RenderingRequest_AVROSchema_7c1f001051c16fdb7dbf26522612d0c01f638559",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
+    {
+      "name": "outgoing-rendering-requests",
+      "defaultSchemaId": "RenderingRequest_AVROSchema_7c1f001051c16fdb7dbf26522612d0c01f638559",
+      "connector": "smallrye-pulsar"
+    },
     {
       "name": "pages",
       "defaultSchemaId": "pages",
@@ -33,25 +38,9 @@
       "name": "fragments",
       "defaultSchemaId": "fragments",
       "connector": "smallrye-pulsar"
-    },
-    {
-      "name": "outgoing-rendering-requests",
-      "defaultSchemaId": "RenderingRequest_AVROSchema_eb6d2a76294dbec99385016289ab9a1601314eb8",
-      "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Data_AVROSchema_d3653723966482c11272acbbda20a9fb504c8cd8": {
-      "type": "record",
-      "name": "Data",
-      "namespace": "dev.streamx.blueprints.data",
-      "fields": [
-        {
-          "name": "content",
-          "type": "bytes"
-        }
-      ]
-    },
     "rendering-contexts": {
       "type": "record",
       "name": "RenderingContext",
@@ -102,6 +91,17 @@
         }
       ]
     },
+    "Data_AVROSchema_82b5943c8a36c612a5b3ddaf45b1179e15a549d7": {
+      "type": "record",
+      "name": "Data",
+      "namespace": "dev.streamx.blueprints.data",
+      "fields": [
+        {
+          "name": "content",
+          "type": "bytes"
+        }
+      ]
+    },
     "pages": {
       "type": "record",
       "name": "Page",
@@ -113,7 +113,7 @@
         }
       ]
     },
-    "Renderer_AVROSchema_0f903180f31eb9946264a126db51787b9c682d1e": {
+    "Renderer_AVROSchema_b8ee334878ad1e259840f80a46da5442a68e23c9": {
       "type": "record",
       "name": "Renderer",
       "namespace": "dev.streamx.blueprints.data",
@@ -124,7 +124,7 @@
         }
       ]
     },
-    "RenderingRequest_AVROSchema_eb6d2a76294dbec99385016289ab9a1601314eb8": {
+    "RenderingRequest_AVROSchema_7c1f001051c16fdb7dbf26522612d0c01f638559": {
       "type": "record",
       "name": "RenderingRequest",
       "namespace": "dev.streamx.blueprints.rendering.engine",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/sitemap-generator-processing-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/sitemap-generator-processing-service/2.0.4-jvm.json
similarity index 67%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/sitemap-generator-processing-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/sitemap-generator-processing-service/2.0.4-jvm.json
index 3141889b..0edf5e14 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/sitemap-generator-processing-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/sitemap-generator-processing-service/2.0.4-jvm.json
@@ -1,22 +1,22 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/sitemap-generator-processing-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/sitemap-generator-processing-service:2.0.4-jvm",
   "type": "processing",
   "incoming": [
     {
       "name": "incoming-pages",
-      "defaultSchemaId": "Page_AVROSchema_3618e74b710f3e53032beb490930d2e86df40a8c",
+      "defaultSchemaId": "Page_AVROSchema_715029fc48b1b23a819547419aec107a0e807a26",
       "connector": "smallrye-pulsar"
     }
   ],
   "outgoing": [
     {
       "name": "outgoing-sitemaps",
-      "defaultSchemaId": "WebResource_AVROSchema_b7b7f432fe75c2634ef2461479490a7c313323d4",
+      "defaultSchemaId": "WebResource_AVROSchema_b1c8c7ef62d9da299b75e26fc7b322459175b25a",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Page_AVROSchema_3618e74b710f3e53032beb490930d2e86df40a8c": {
+    "Page_AVROSchema_715029fc48b1b23a819547419aec107a0e807a26": {
       "type": "record",
       "name": "Page",
       "namespace": "dev.streamx.blueprints.data",
@@ -27,7 +27,7 @@
         }
       ]
     },
-    "WebResource_AVROSchema_b7b7f432fe75c2634ef2461479490a7c313323d4": {
+    "WebResource_AVROSchema_b1c8c7ef62d9da299b75e26fc7b322459175b25a": {
       "type": "record",
       "name": "WebResource",
       "namespace": "dev.streamx.blueprints.data",
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/web-delivery-service/2.0.0-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/web-delivery-service/2.0.4-jvm.json
similarity index 66%
rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/web-delivery-service/2.0.0-jvm.json
rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/web-delivery-service/2.0.4-jvm.json
index c7cd9b7c..f7d0db79 100644
--- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.0/web-delivery-service/2.0.0-jvm.json
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.4/web-delivery-service/2.0.4-jvm.json
@@ -1,32 +1,32 @@
 {
-  "image": "ghcr.io/streamx-dev/streamx-blueprints/web-delivery-service:2.0.0-jvm",
+  "image": "ghcr.io/streamx-dev/streamx-blueprints/web-delivery-service:2.0.4-jvm",
   "type": "delivery",
   "incoming": [
     {
       "name": "assets",
-      "defaultSchemaId": "Asset_AVROSchema_15af6e95e410a8cc64064d92d9748cdda8a38d58",
+      "defaultSchemaId": "Asset_AVROSchema_da00fbaa68a92d296374c4834280f578348aec9f",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "fragments",
-      "defaultSchemaId": "Fragment_AVROSchema_f27724c5b05bfd49659537e231bf2e14078570c2",
+      "defaultSchemaId": "Fragment_AVROSchema_bf32ddc35e51194092008879253d2c87f223d8e0",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "pages",
-      "defaultSchemaId": "Page_AVROSchema_1a7df3469da2953ab486e7253157914bee779e49",
+      "defaultSchemaId": "Page_AVROSchema_db052f9a04a60c32b917ee3e63391bd8c3a71c36",
       "connector": "smallrye-pulsar"
     },
     {
       "name": "web-resources",
-      "defaultSchemaId": "WebResource_AVROSchema_b3dacc017d9ac72cc803b465d4a79b6c1fe89140",
+      "defaultSchemaId": "WebResource_AVROSchema_75a3d49a5f7806cdd54fcd6015cb78b5702bba63",
       "connector": "smallrye-pulsar"
     }
   ],
   "schemas": {
-    "Fragment_AVROSchema_f27724c5b05bfd49659537e231bf2e14078570c2": {
+    "Asset_AVROSchema_da00fbaa68a92d296374c4834280f578348aec9f": {
       "type": "record",
-      "name": "Fragment",
+      "name": "Asset",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -35,9 +35,9 @@
         }
       ]
     },
-    "WebResource_AVROSchema_b3dacc017d9ac72cc803b465d4a79b6c1fe89140": {
+    "Page_AVROSchema_db052f9a04a60c32b917ee3e63391bd8c3a71c36": {
       "type": "record",
-      "name": "WebResource",
+      "name": "Page",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -46,9 +46,9 @@
         }
       ]
     },
-    "Page_AVROSchema_1a7df3469da2953ab486e7253157914bee779e49": {
+    "Fragment_AVROSchema_bf32ddc35e51194092008879253d2c87f223d8e0": {
       "type": "record",
-      "name": "Page",
+      "name": "Fragment",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
@@ -57,9 +57,9 @@
         }
       ]
     },
-    "Asset_AVROSchema_15af6e95e410a8cc64064d92d9748cdda8a38d58": {
+    "WebResource_AVROSchema_75a3d49a5f7806cdd54fcd6015cb78b5702bba63": {
       "type": "record",
-      "name": "Asset",
+      "name": "WebResource",
       "namespace": "dev.streamx.blueprints.data",
       "fields": [
         {
diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/README.md b/mesh/services/streamx-service-metadata/streamx-blueprints/README.md
new file mode 100644
index 00000000..59f4fd63
--- /dev/null
+++ b/mesh/services/streamx-service-metadata/streamx-blueprints/README.md
@@ -0,0 +1,5 @@
+Files in this directory must contain blueprints service metadata in the same version as declared in mesh.yaml
+in the `defaultImageTag` property for `defaultRegistry: ghcr.io/streamx-dev/streamx-blueprints`.
+
+How to re-generate the files:
+ * https://github.com/streamx-dev/streamx-blueprints/blob/main/RELEASE.md#add-services-metadata-to-github-release
\ No newline at end of file