diff --git a/templates/noKibana/accountsESDT.go b/templates/noKibana/accountsESDT.go
index 027976b7..3204c24d 100644
--- a/templates/noKibana/accountsESDT.go
+++ b/templates/noKibana/accountsESDT.go
@@ -73,7 +73,7 @@ var AccountsESDT = Object{
 				"format": "epoch_second",
 			},
 			"token": Object{
-				"type": "text",
+				"type": "keyword",
 			},
 			"tokenNonce": Object{
 				"type": "double",
diff --git a/templates/noKibana/accountsESDTHistory.go b/templates/noKibana/accountsESDTHistory.go
index 12c1b589..81e5cb08 100644
--- a/templates/noKibana/accountsESDTHistory.go
+++ b/templates/noKibana/accountsESDTHistory.go
@@ -34,7 +34,7 @@ var AccountsESDTHistory = Object{
 				"format": "epoch_second",
 			},
 			"token": Object{
-				"type": "text",
+				"type": "keyword",
 			},
 			"tokenNonce": Object{
 				"type": "double",
diff --git a/templates/noKibana/tokens.go b/templates/noKibana/tokens.go
index 0035de16..cc8e6d07 100644
--- a/templates/noKibana/tokens.go
+++ b/templates/noKibana/tokens.go
@@ -166,7 +166,7 @@ var Tokens = Object{
 				"format": "epoch_second",
 			},
 			"token": Object{
-				"type": "text",
+				"type": "keyword",
 			},
 			"type": Object{
 				"type": "keyword",