diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_Index_user_group_membership_groups.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_Index_user_group_membership_groups.sql
new file mode 100644
index 00000000000..888918292a5
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_Index_user_group_membership_groups.sql
@@ -0,0 +1 @@
+-- NOOP
\ No newline at end of file
diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_Index_user_group_membership_groups.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_Index_user_group_membership_groups.sql
new file mode 100644
index 00000000000..2c451dbadbc
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_Index_user_group_membership_groups.sql
@@ -0,0 +1,9 @@
+CREATE INDEX idx_users_zone_id_created ON users (identity_zone_id, created);
+
+CREATE INDEX idx_group_membership_zone_member_group ON group_membership (identity_zone_id, member_id, group_id);
+
+CREATE INDEX idx_group_membership_id_zone_id ON group_membership (group_id, identity_zone_id);
+
+CREATE INDEX idx_groups_zone_id_created ON `groups` (identity_zone_id, created);
+
+CREATE INDEX idx_external_group_zone_id_created ON external_group_mapping (group_id, identity_zone_id);
diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_Index_user_group_membership_groups.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_Index_user_group_membership_groups.sql
new file mode 100644
index 00000000000..888918292a5
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_Index_user_group_membership_groups.sql
@@ -0,0 +1 @@
+-- NOOP
\ No newline at end of file