diff --git a/src/main/scala/com.github.mgifos.workouts/model/Step.scala b/src/main/scala/com.github.mgifos.workouts/model/Step.scala
index c639d3b..5c64943 100644
--- a/src/main/scala/com.github.mgifos.workouts/model/Step.scala
+++ b/src/main/scala/com.github.mgifos.workouts/model/Step.scala
@@ -39,9 +39,9 @@ case class RepeatStep(count: Int, steps: Seq[Step]) extends Step {
 
   override def json(order: Int) = Json.obj(
     "stepId" -> JsNull,
-    "stepOrder" -> 2,
+    "stepOrder" -> order,
     "stepType" -> Json.obj(
-      "stepTypeId" -> 6,
+      "stepTypeId" -> typeId,
       "stepTypeKey" -> "repeat"),
     "numberOfIterations" -> count,
     "smartRepeat" -> false,