diff --git a/kamelets/elasticsearch-index-sink.kamelet.yaml b/kamelets/elasticsearch-index-sink.kamelet.yaml
index 569fe331b..97b4d5911 100644
--- a/kamelets/elasticsearch-index-sink.kamelet.yaml
+++ b/kamelets/elasticsearch-index-sink.kamelet.yaml
@@ -116,7 +116,8 @@ spec:
             steps:
             - set-header:
                 name: "indexId"
-                simple: "camel-k-index-es"
+                expression:
+                  simple: ${bean:org.apache.camel.support.ShortUuidGenerator?method=generateUuid}
       - choice:
           when:
           - simple: "${header[indexName]}"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
index 569fe331b..97b4d5911 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
@@ -116,7 +116,8 @@ spec:
             steps:
             - set-header:
                 name: "indexId"
-                simple: "camel-k-index-es"
+                expression:
+                  simple: ${bean:org.apache.camel.support.ShortUuidGenerator?method=generateUuid}
       - choice:
           when:
           - simple: "${header[indexName]}"