diff --git a/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb b/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb
index 0f2328396..09aa76bd8 100644
--- a/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb
+++ b/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb
@@ -82,7 +82,7 @@ def cleanup_duplicate_data_delete_all(model, unique_index_columns)
     ContainerServicePortConfig => %i(container_service_id name),
     ContainerTemplateParameter => %i(container_template_id name),
     ContainerVolume            => %i(parent_id parent_type ems_ref name),
-    CustomAttribute            => %i(resource_id resource_type name unique_name section source),
+    CustomAttribute            => %i(resource_id resource_type name section source),
     Hardware                   => %i(vm_or_template_id host_id computer_system_id),
     OperatingSystem            => %i(vm_or_template_id host_id computer_system_id),
   }.freeze
diff --git a/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb b/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb
index 9a3b47daa..40d026549 100644
--- a/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb
+++ b/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb
@@ -73,9 +73,9 @@ def change
               :unique => true,
               :name   => "index_container_volumes_unique_multi_column"
     add_index :custom_attributes,
-              %i(resource_id resource_type name unique_name section source),
+              %i(resource_id resource_type name section source),
               :unique => true,
-              :name   => "index_custom_attributes_parameters_unique_multi_column"
+              :name   => "index_custom_attributes_parameters_unique_without_unique_name"
 
     remove_index :hardwares, :vm_or_template_id
     add_index :hardwares,