diff --git a/jobs/opensearch_templates/templates/component-index-mappings-app.json.erb b/jobs/opensearch_templates/templates/component-index-mappings-app.json.erb
index 1b5ab78b..d5b1dc25 100644
--- a/jobs/opensearch_templates/templates/component-index-mappings-app.json.erb
+++ b/jobs/opensearch_templates/templates/component-index-mappings-app.json.erb
@@ -28,7 +28,9 @@ keyword_default = { "type": "keyword", "index": true }.to_json
             "space_id":     <%= keyword_default %>,
             "process_id":     <%= keyword_default %>,
             "process_instance_id": <%= keyword_default %>,
-            "process_type":  <%= keyword_default %>
+            "process_type":  <%= keyword_default %>,
+            "service_offering": <%= keyword_default %>,
+            "service_plan": <%= keyword_default %>
           }
         },
         "app": {