diff --git a/src/main/resources/db/migration/V7__database_indexes.sql b/src/main/resources/db/migration/V7__database_indexes.sql
new file mode 100644
index 0000000..a52b12e
--- /dev/null
+++ b/src/main/resources/db/migration/V7__database_indexes.sql
@@ -0,0 +1,7 @@
+ALTER TABLE oauth2_authorization_consent
+    ADD INDEX IF NOT EXISTS I_authorization_consent_registered_client_principal (registered_client_id, principal_name);
+
+ALTER TABLE v2_oauth2_authorization ADD INDEX IF NOT EXISTS I_authorization_access_token (access_token);
+ALTER TABLE v2_oauth2_authorization ADD INDEX IF NOT EXISTS I_authorization_code_token (code_token);
+
+ALTER TABLE v2_client ADD INDEX IF NOT EXISTS I_client_client_id (client_id);