diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index b90ccd74098883a0f8f71c5cbc8f83bcf381f0f9..32ea20a0c39ffc1189d1875749a3cda52fd088fd 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -39,7 +39,6 @@ services:
     image: docker.io/bitnami/mariadb-galera:11.3.2-debian-12-r9
     volumes:
       - data-db-data:/bitnami/mariadb
-      - "${SHARED_VOLUME:-/tmp}:/tmp"
     ports:
       - "3307:3306"
     environment:
@@ -138,8 +137,6 @@ services:
     container_name: dbrepo-metadata-service
     hostname: metadata-service
     image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.2
-    volumes:
-      - "${SHARED_VOLUME:-/tmp}:/tmp"
     environment:
       ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
       ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}"
@@ -214,8 +211,6 @@ services:
       METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
       SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
-    volumes:
-      - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
     healthcheck:
       test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
       interval: 10s
@@ -480,8 +475,6 @@ services:
     container_name: dbrepo-data-service
     hostname: data-service
     image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.2
-    volumes:
-      - "${SHARED_VOLUME:-/tmp}:/tmp"
     environment:
       AUTH_SERVICE_ADMIN: "${AUTH_SERVICE_ADMIN:-admin}"
       AUTH_SERVICE_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
@@ -513,7 +506,6 @@ services:
       S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
       S3_BUCKET: "${S3_BUCKET:-dbrepo}"
       S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
-      S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
       S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
       S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
       SPARK_USER: "${COMPUTE_SERVICE_USERNAME:-spark}"
diff --git a/dbrepo-broker-service/enabled_plugins b/dbrepo-broker-service/enabled_plugins
index db0ae888499ea44c2dd7d40f5ac9c8fcc0ca0567..d930dd9c69b2b9d2a295b5aa54cb17ffc80a903f 100644
--- a/dbrepo-broker-service/enabled_plugins
+++ b/dbrepo-broker-service/enabled_plugins
@@ -1 +1 @@
-[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_mqtt].
\ No newline at end of file
+[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_mqtt].
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index e4ca259081947502c2d9164c56fc82e1070cda23..e051ab7287aff1e850564a413ff0fed06bc729d9 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -302,7 +302,6 @@
             <groupId>at.tuwien</groupId>
             <artifactId>dbrepo-metadata-service-entities</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/dbrepo-metadata-db/migration/16/data.py b/dbrepo-metadata-db/migration/16/data.py
index fe627c2befe1ddb99ee176778e8b41cdcde6cd1f..cd81ea5b4d0fb4bad1fdc67c55e19401875a59bb 100644
--- a/dbrepo-metadata-db/migration/16/data.py
+++ b/dbrepo-metadata-db/migration/16/data.py
@@ -92,6 +92,7 @@ def update_databases() -> None:
         for view in database.views:
             v_old_id: int = view.id
             v_new_id: uuid = uuid.uuid4()
+            plan.append(f"UPDATE mdb_view SET ID = '{v_new_id}' WHERE ID = '{v_old_id}';")
             plan.append(f"UPDATE mdb_identifiers SET vid = '{v_new_id}' WHERE vid = '{v_old_id}';")
             plan.append(f"UPDATE mdb_view_columns SET id = UUID(), view_id = '{v_new_id}' WHERE id = '{v_old_id}';")
         for table in database.tables:
@@ -101,6 +102,7 @@ def update_databases() -> None:
             plan.append(f"UPDATE mdb_columns SET tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';")
             plan.append(f"UPDATE mdb_constraints_primary_key SET pkid = UUID(), tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';")
             plan.append(f"UPDATE mdb_constraints_unique SET tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';")
+            plan.append(f"UPDATE mdb_constraints_foreign_key SET rtid = '{tbl_new_id}' WHERE rtid = '{tbl_old_id}';")
             plan.append(
                 f"UPDATE mdb_constraints_checks SET id = UUID(), tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';")
             for fk in table.constraints.foreign_keys:
@@ -173,6 +175,7 @@ def update_identifiers() -> None:
         plan.append(f"UPDATE mdb_identifier_creators SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
         plan.append(f"UPDATE mdb_identifier_funders SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
         plan.append(f"UPDATE mdb_identifier_licenses SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
+        plan.append(f"UPDATE mdb_identifier_related SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
         for title in identifier.titles:
             t_old_id = title.id
             t_new_id: uuid = uuid.uuid4()
@@ -189,6 +192,10 @@ def update_identifiers() -> None:
             f_old_id = funder.id
             f_new_id: uuid = uuid.uuid4()
             plan.append(f"UPDATE mdb_identifier_funders SET id = '{f_new_id}' WHERE id = '{f_old_id}';")
+        for funder in identifier.related:
+            r_old_id = funder.id
+            r_new_id: uuid = uuid.uuid4()
+            plan.append(f"UPDATE mdb_identifier_related SET id = '{r_new_id}' WHERE id = '{r_old_id}';")
     plan.append("COMMIT;")