diff --git a/openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql
index 5d85eff60..ee145bac8 100644
--- a/openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql
+++ b/openid-connect-server-webapp/src/main/resources/db/tables/mysql_database_tables.sql
@@ -356,3 +356,10 @@ CREATE TABLE IF NOT EXISTS saved_registered_client (
 	issuer VARCHAR(1024),
 	registered_client VARCHAR(8192)
 );
+
+
+CREATE INDEX at_tv_idx ON access_token(token_value(767));
+CREATE INDEX ts_oi_idx ON token_scope(owner_id);
+CREATE INDEX at_exp_idx ON access_token(expiration);
+CREATE INDEX rf_ahi_idx ON refresh_token(auth_holder_id);
+CREATE INDEX cd_ci_idx ON client_details(client_id);