diff --git a/dbrepo-metadata-db/1_setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql
index b9055cf884bdb3d310310c52a17471504cdc6fac..a3a28b22fda3db9e6a03a4bda165aaf35d54cc04 100644
--- a/dbrepo-metadata-db/1_setup-schema.sql
+++ b/dbrepo-metadata-db/1_setup-schema.sql
@@ -351,7 +351,9 @@ CREATE TABLE IF NOT EXISTS `mdb_identifiers`
     last_modified     TIMESTAMP,
     PRIMARY KEY (`id`), /* must be a single id from persistent identifier concept */
     FOREIGN KEY (`dbid`) REFERENCES mdb_databases (`id`),
-    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`)
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`),
+    FOREIGN KEY (`tid`) REFERENCES mdb_tables (`id`),
+    FOREIGN KEY (`vid`) REFERENCES mdb_view (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
diff --git a/helm/dbrepo/files/01-setup-schema.sql b/helm/dbrepo/files/01-setup-schema.sql
index b9055cf884bdb3d310310c52a17471504cdc6fac..a3a28b22fda3db9e6a03a4bda165aaf35d54cc04 100644
--- a/helm/dbrepo/files/01-setup-schema.sql
+++ b/helm/dbrepo/files/01-setup-schema.sql
@@ -351,7 +351,9 @@ CREATE TABLE IF NOT EXISTS `mdb_identifiers`
     last_modified     TIMESTAMP,
     PRIMARY KEY (`id`), /* must be a single id from persistent identifier concept */
     FOREIGN KEY (`dbid`) REFERENCES mdb_databases (`id`),
-    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`)
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`),
+    FOREIGN KEY (`tid`) REFERENCES mdb_tables (`id`),
+    FOREIGN KEY (`vid`) REFERENCES mdb_view (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`