diff --git a/cmd/setup/06/adminapi.sql b/cmd/setup/06/adminapi.sql
index f87ef6e5d..6d1b04f70 100644
--- a/cmd/setup/06/adminapi.sql
+++ b/cmd/setup/06/adminapi.sql
@@ -27,4 +27,4 @@ CREATE TABLE adminapi.styling2 (
     PRIMARY KEY (instance_id, aggregate_id, label_policy_state)
 );
 
-CREATE INDEX owner_removed_idx ON adminapi.styling2 (owner_removed);
\ No newline at end of file
+CREATE INDEX  st2_owner_removed_idx ON adminapi.styling2 (owner_removed);
\ No newline at end of file
diff --git a/cmd/setup/06/auth.sql b/cmd/setup/06/auth.sql
index 8271723df..d502d4f93 100644
--- a/cmd/setup/06/auth.sql
+++ b/cmd/setup/06/auth.sql
@@ -45,7 +45,7 @@ CREATE TABLE auth.users2 (
 
     PRIMARY KEY (instance_id, id)
 );
-CREATE INDEX owner_removed_idx ON auth.users2 (owner_removed);
+CREATE INDEX u2_owner_removed_idx ON auth.users2 (owner_removed);
 
 CREATE TABLE auth.user_external_idps2 (
     external_user_id TEXT NOT NULL,
@@ -62,7 +62,7 @@ CREATE TABLE auth.user_external_idps2 (
 
     PRIMARY KEY (instance_id, external_user_id, idp_config_id)
 );
-CREATE INDEX owner_removed_idx ON auth.user_external_idps2 (owner_removed);
+CREATE INDEX ext_idps2_owner_removed_idx ON auth.user_external_idps2 (owner_removed);
 
 CREATE TABLE auth.org_project_mapping2 (
     org_id TEXT NOT NULL,
@@ -73,7 +73,7 @@ CREATE TABLE auth.org_project_mapping2 (
 
     PRIMARY KEY (instance_id, org_id, project_id)
 );
-CREATE INDEX owner_removed_idx ON auth.org_project_mapping2 (owner_removed);
+CREATE INDEX org_proj_m2_owner_removed_idx ON auth.org_project_mapping2 (owner_removed);
 
 CREATE TABLE auth.idp_providers2 (
     aggregate_id TEXT NOT NULL,
@@ -91,7 +91,7 @@ CREATE TABLE auth.idp_providers2 (
 
     PRIMARY KEY (instance_id, aggregate_id, idp_config_id)
 );
-CREATE INDEX owner_removed_idx ON auth.idp_providers2 (owner_removed);
+CREATE INDEX idp_prov2_owner_removed_idx ON auth.idp_providers2 (owner_removed);
 
 CREATE TABLE auth.idp_configs2 (
     idp_config_id TEXT NOT NULL,
@@ -121,4 +121,4 @@ CREATE TABLE auth.idp_configs2 (
 
     PRIMARY KEY (instance_id, idp_config_id)
 );
-CREATE INDEX owner_removed_idx ON auth.idp_configs2 (owner_removed);
+CREATE INDEX idp_conf2_owner_removed_idx ON auth.idp_configs2 (owner_removed);