diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
index 5f5e369dd..3433fadaa 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
@@ -7,11 +7,10 @@ $$ LANGUAGE sql IMMUTABLE;
 
 COMMIT;
 
-CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_m ON autocomplete (project_id, md5(value), type);
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
 
 BEGIN;
 
 DROP INDEX IF EXISTS autocomplete_unique;
-ALTER INDEX IF EXISTS autocomplete_unique_m RENAME TO autocomplete_unique;
 
 COMMIT;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql b/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
index a3a0ddd10..26e9f02ae 100644
--- a/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
+++ b/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
@@ -7,11 +7,10 @@ $$ LANGUAGE sql IMMUTABLE;
 
 COMMIT;
 
-CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_m ON autocomplete (project_id, md5(value), type);
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
 
 BEGIN;
 
 DROP INDEX IF EXISTS autocomplete_unique;
-ALTER INDEX IF EXISTS autocomplete_unique_m RENAME TO autocomplete_unique;
 
 COMMIT;
\ No newline at end of file