diff --git a/amundsen_common/models/index_map.py b/amundsen_common/models/index_map.py
index e7c9ae5..680d1bd 100644
--- a/amundsen_common/models/index_map.py
+++ b/amundsen_common/models/index_map.py
@@ -65,7 +65,13 @@
               "type": "keyword"
             },
             "cluster": {
-              "type": "text"
+              "type": "text",
+              "analyzer": "simple",
+              "fields": {
+                "raw": {
+                  "type": "keyword"
+                }
+              }
             },
             "database": {
               "type": "text",