diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index 351e342917e502c5d5483303d77b64dbe5731bea..a7adf71730cccabfe592cc4673fc7827e2cdbf4c 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -13,8 +13,24 @@ emergency_schema = {
             + " partner's platform/C2",
             "example": "go_home",
         },
-        "target_waypoint": {
-            "$ref": "https://geojson.org/schema/Point.json",
+        "target_waypoint_latitude": {
+            "type": "number",
+            "format": "float",
+            "description": "Y-coordinate safe place for respective platform",
+            "example": 50.365,
+        },
+        "target_waypoint_longitude": {
+            "type": "number",
+            "format": "float",
+            "description": "X-coordinate safe place for respective platform",
+            "example": -7.432,
+        },
+        "target_depth": {
+            "type": "number",
+            "format": "float",
+            "description": "Z-coordinate safe place for respective platform"
+            + " . If platform to NOT stay at depth, key in `0.0`",
+            "example": 10.0,
         },
     },
     "required": [
diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index 99672c8becbef3db5d2aae585a7a13fd96bfa3db..bc4367dddf3e64f06feb61f2db2e90f5938b2633 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -1794,8 +1794,23 @@
                             "example": "go_home",
                             "type": "string"
                           },
-                          "target_waypoint": {
-                            "$ref": "#/components/schemas/geojson.org.schema.Point.json"
+                          "target_depth": {
+                            "description": "Z-coordinate safe place for respective platform . If platform to NOT stay at depth, key in `0.0`",
+                            "example": 10.0,
+                            "format": "float",
+                            "type": "number"
+                          },
+                          "target_waypoint_latitude": {
+                            "description": "Y-coordinate safe place for respective platform",
+                            "example": 50.365,
+                            "format": "float",
+                            "type": "number"
+                          },
+                          "target_waypoint_longitude": {
+                            "description": "X-coordinate safe place for respective platform",
+                            "example": -7.432,
+                            "format": "float",
+                            "type": "number"
                           }
                         },
                         "required": [