diff --git a/jans-linux-setup/jans_setup/schema/jans_schema.json b/jans-linux-setup/jans_setup/schema/jans_schema.json
index 3658ccb0a35..f76f8815d4c 100644
--- a/jans-linux-setup/jans_setup/schema/jans_schema.json
+++ b/jans-linux-setup/jans_setup/schema/jans_schema.json
@@ -447,7 +447,7 @@
       "names": [
         "clnId"
       ],
-      "multivalued": true,
+      "multivalued": false,
       "oid": "jansAttr",
       "substr": "caseIgnoreSubstringsMatch",
       "syntax": "1.3.6.1.4.1.1466.115.121.1.15",
diff --git a/jans-linux-setup/jans_setup/static/rdbm/mysql_index.json b/jans-linux-setup/jans_setup/static/rdbm/mysql_index.json
index c12885a8f10..e995ccf0b83 100644
--- a/jans-linux-setup/jans_setup/static/rdbm/mysql_index.json
+++ b/jans-linux-setup/jans_setup/static/rdbm/mysql_index.json
@@ -72,7 +72,12 @@
     ]
   },
   "jansToken": {
-    "fields": [],
+    "fields": [
+      "authzCode",
+      "grtId",
+      "ssnId",
+      "tknCde"
+    ],
     "custom": [
       "`del`, `exp`"
     ]
@@ -139,17 +144,6 @@
     ],
     "custom": []
   },
-  "token": {
-    "fields": [
-      "authzCode",
-      "grtId",
-      "ssnId",
-      "tknCde"
-    ],
-    "custom": [
-      "`del`, `exp`"
-    ]
-  },
   "cache": {
     "fields": [],
     "custom": [
diff --git a/jans-linux-setup/jans_setup/static/rdbm/pgsql_index.json b/jans-linux-setup/jans_setup/static/rdbm/pgsql_index.json
index 7d484e338ce..423312d2e88 100644
--- a/jans-linux-setup/jans_setup/static/rdbm/pgsql_index.json
+++ b/jans-linux-setup/jans_setup/static/rdbm/pgsql_index.json
@@ -72,7 +72,12 @@
     ]
   },
   "jansToken": {
-    "fields": [],
+    "fields": [
+      "authzCode",
+      "grtId",
+      "ssnId",
+      "tknCde"
+    ],
     "custom": [
       "(\"del\", \"exp\")"
     ]
@@ -139,17 +144,6 @@
     ],
     "custom": []
   },
-  "token": {
-    "fields": [
-      "authzCode",
-      "grtId",
-      "ssnId",
-      "tknCde"
-    ],
-    "custom": [
-      "(\"del\", \"exp\")"
-    ]
-  },
   "cache": {
     "fields": [],
     "custom": [
diff --git a/jans-linux-setup/jans_setup/static/rdbm/spanner_index.json b/jans-linux-setup/jans_setup/static/rdbm/spanner_index.json
index 9e1cfbf99b3..68f68f525bd 100644
--- a/jans-linux-setup/jans_setup/static/rdbm/spanner_index.json
+++ b/jans-linux-setup/jans_setup/static/rdbm/spanner_index.json
@@ -82,7 +82,7 @@
       "`del`, `exp`"
     ]
   },
-  "token": {
+  "jansToken": {
     "fields": [
       "authzCode",
       "grtId",