diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/H2/V1_12_31__add_type_to_ds_index___H2.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/H2/V1_12_31__add_type_to_ds_index___H2.sql
new file mode 100644
index 000000000..0e602804e
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/H2/V1_12_31__add_type_to_ds_index___H2.sql
@@ -0,0 +1,2 @@
+alter table sp_distribution_set drop constraint uk_distrib_set;
+alter table sp_distribution_set add constraint uk_distrib_set unique (tenant, name, version, ds_id);
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/MYSQL/V1_12_31__add_type_to_ds_index___MYSQL.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/MYSQL/V1_12_31__add_type_to_ds_index___MYSQL.sql
new file mode 100644
index 000000000..0e602804e
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/MYSQL/V1_12_31__add_type_to_ds_index___MYSQL.sql
@@ -0,0 +1,2 @@
+alter table sp_distribution_set drop constraint uk_distrib_set;
+alter table sp_distribution_set add constraint uk_distrib_set unique (tenant, name, version, ds_id);
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/POSTGRESQL/V1_12_32__add_type_to_ds_index___POSTGRESQL.sql b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/POSTGRESQL/V1_12_32__add_type_to_ds_index___POSTGRESQL.sql
new file mode 100644
index 000000000..e329b14a5
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa-flyway/src/main/resources/db/migration/POSTGRESQL/V1_12_32__add_type_to_ds_index___POSTGRESQL.sql
@@ -0,0 +1,2 @@
+alter table sp_distribution_set drop constraint uk_distrib_set_sp_distribution_set;
+alter table sp_distribution_set add constraint uk_distrib_set_sp_distribution_set unique (tenant, name, version, ds_id);
\ No newline at end of file