diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/KeyResultBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/KeyResultBusinessService.java
index 8f2b27ff79..09e88444bb 100644
--- a/backend/src/main/java/ch/puzzle/okr/service/business/KeyResultBusinessService.java
+++ b/backend/src/main/java/ch/puzzle/okr/service/business/KeyResultBusinessService.java
@@ -169,6 +169,8 @@ private KeyResult makeCopyOfKeyResultMetric(KeyResult keyResult, Objective dupli
                 .withUnit(((KeyResultMetric) keyResult).getUnit()) //
                 .withBaseline(((KeyResultMetric) keyResult).getBaseline()) //
                 .withStretchGoal(((KeyResultMetric) keyResult).getStretchGoal()) //
+                .withCommitValue(((KeyResultMetric) keyResult).getCommitValue()) //
+                .withTargetValue(((KeyResultMetric) keyResult).getTargetValue()) //
                 .build();
     }
 
diff --git a/backend/src/main/resources/db/migration/V3_6_4__calculate_commit_and_target_values.sql b/backend/src/main/resources/db/migration/V3_6_4__calculate_commit_and_target_values.sql
new file mode 100644
index 0000000000..ef6a9e452c
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V3_6_4__calculate_commit_and_target_values.sql
@@ -0,0 +1,8 @@
+UPDATE key_result
+SET
+    target_value = ROUND((baseline + (stretch_goal - baseline) * 0.7)::numeric, 2),
+    commit_value = ROUND((baseline + (stretch_goal - baseline) * 0.3)::numeric, 2)
+WHERE baseline IS NOT NULL
+  AND stretch_goal IS NOT NULL
+  AND target_value is NULL
+  AND commit_value is NULL;