diff --git a/docs/db/changelog/changesets/user-data-store/0.1.x/20230322-audit-indexes.xml b/docs/db/changelog/changesets/user-data-store/0.1.x/20230322-audit-indexes.xml
index e19206c..171948e 100644
--- a/docs/db/changelog/changesets/user-data-store/0.1.x/20230322-audit-indexes.xml
+++ b/docs/db/changelog/changesets/user-data-store/0.1.x/20230322-audit-indexes.xml
@@ -58,19 +58,7 @@
         <rollback />
     </changeSet>
 
-    <changeSet id="5" logicalFilePath="user-data-store/0.1.x/20230322-audit-indexes.xml" author="Lubos Racansky">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <indexExists tableName="audit_param" indexName="audit_param_log" />
-            </not>
-        </preConditions>
-        <comment>Create a new index on audit_param(audit_log_id)</comment>
-        <createIndex tableName="audit_param" indexName="audit_param_log">
-            <column name="audit_log_id" />
-        </createIndex>
-        <!-- no rollback on purpose, the audit tables may be shared across several components -->
-        <rollback />
-    </changeSet>
+    <!-- changeSet id="5" was removed because it clashes with an index generated for the primary key column -->
 
     <changeSet id="6" logicalFilePath="user-data-store/0.1.x/20230322-audit-indexes.xml" author="Lubos Racansky">
         <preConditions onFail="MARK_RAN">
diff --git a/docs/sql/mssql/create-schema.sql b/docs/sql/mssql/create-schema.sql
index f323890..5655337 100644
--- a/docs/sql/mssql/create-schema.sql
+++ b/docs/sql/mssql/create-schema.sql
@@ -48,11 +48,6 @@ GO
 CREATE NONCLUSTERED INDEX audit_log_type ON audit_log(audit_type);
 GO
 
--- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::5::Lubos Racansky
--- Create a new index on audit_param(audit_log_id)
-CREATE NONCLUSTERED INDEX audit_param_log ON audit_param(audit_log_id);
-GO
-
 -- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::6::Lubos Racansky
 -- Create a new index on audit_param(timestamp_created)
 CREATE NONCLUSTERED INDEX audit_param_timestamp ON audit_param(timestamp_created);
diff --git a/docs/sql/oracle/create-schema.sql b/docs/sql/oracle/create-schema.sql
index 850b446..7110e72 100644
--- a/docs/sql/oracle/create-schema.sql
+++ b/docs/sql/oracle/create-schema.sql
@@ -38,10 +38,6 @@ CREATE INDEX audit_log_level ON audit_log(audit_level);
 -- Create a new index on audit_log(audit_type)
 CREATE INDEX audit_log_type ON audit_log(audit_type);
 
--- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::5::Lubos Racansky
--- Create a new index on audit_param(audit_log_id)
-CREATE INDEX audit_param_log ON audit_param(audit_log_id);
-
 -- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::6::Lubos Racansky
 -- Create a new index on audit_param(timestamp_created)
 CREATE INDEX audit_param_timestamp ON audit_param(timestamp_created);
diff --git a/docs/sql/postgresql/create-schema.sql b/docs/sql/postgresql/create-schema.sql
index 9a8d090..6611487 100644
--- a/docs/sql/postgresql/create-schema.sql
+++ b/docs/sql/postgresql/create-schema.sql
@@ -38,10 +38,6 @@ CREATE INDEX audit_log_level ON audit_log(audit_level);
 -- Create a new index on audit_log(audit_type)
 CREATE INDEX audit_log_type ON audit_log(audit_type);
 
--- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::5::Lubos Racansky
--- Create a new index on audit_param(audit_log_id)
-CREATE INDEX audit_param_log ON audit_param(audit_log_id);
-
 -- Changeset user-data-store/0.1.x/20230322-audit-indexes.xml::6::Lubos Racansky
 -- Create a new index on audit_param(timestamp_created)
 CREATE INDEX audit_param_timestamp ON audit_param(timestamp_created);