diff --git a/src/main/java/org/radarbase/appserver/entity/UserMetrics.java b/src/main/java/org/radarbase/appserver/entity/UserMetrics.java
index 1ccb9c91..912e503e 100644
--- a/src/main/java/org/radarbase/appserver/entity/UserMetrics.java
+++ b/src/main/java/org/radarbase/appserver/entity/UserMetrics.java
@@ -65,7 +65,7 @@ public class UserMetrics extends AuditModel implements Serializable {
   @Column(name = "last_delivered")
   private Instant lastDelivered;
 
-  @ToString.Exclude @NonNull @OneToOne private User user;
+  @ToString.Exclude @NonNull @OneToOne(mappedBy = "usermetrics") private User user;
 
   public UserMetrics(Instant lastOpened, Instant lastDelivered) {
     this.lastOpened = lastOpened;
diff --git a/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml
new file mode 100644
index 00000000..771504a1
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml
@@ -0,0 +1,19 @@
+databaseChangeLog:
+  - changeSet:
+      id: 1697819541-01
+      author: pauline
+      changes:
+        - dropForeignKeyConstraint:
+            baseColumnNames: user_id
+            baseTableName: user_metrics
+            constraintName: FK65c9asnnjs3q0lktqj103mvcv
+            deferrable: false
+            initiallyDeferred: false
+            referencedColumnNames: id
+            referencedTableName: users
+            validate: true
+        - dropColumn:
+            columns:
+              - column:
+                  name: user_id
+            tableName: user_metrics
\ No newline at end of file