diff --git a/formats/__init__.py b/formats/__init__.py
index 79f2ec5e3f343bce8e1689d0090255a8b5f8d570..5254584932cb76846fa4de64cf62d3c5936024c5 100644
--- a/formats/__init__.py
+++ b/formats/__init__.py
@@ -8,7 +8,7 @@ __all__ = [
 ]
 
 abstract_schema = {
-    "allOf": [{"$ref": "#/definitions/Metadata"}],
+    "allOf": [{"$ref": "#/components/schemas/Metadata"}],
     "type": "object",
     "properties": {
         "payload": {}
diff --git a/generate_swagger.py b/generate_swagger.py
index 5820cdc0f502066930b8d71545aa51f692faed32..a30a9f0c2f3b76c6b38bde0a149047d5c632f0ba 100644
--- a/generate_swagger.py
+++ b/generate_swagger.py
@@ -28,15 +28,15 @@ swagger_config = {
             "model_filter": lambda tag: True,
         }
     ],
-    # "components": {
-    "definitions": {
-        "Metadata": message_metadata,
-        "MissionPlan": full_mission_plan_schema,
-        "Observation": full_observation_schema,
-        "PlanningConfiguration": full_planning_configuration_schema,
-        "PlatformStatus": full_platform_status_message_schema,
-        "Acknowledgement": full_acknowledgement_schema,
-    # }
+    "components": {
+        "schemas": {
+            "Metadata": message_metadata,
+            "MissionPlan": full_mission_plan_schema,
+            "Observation": full_observation_schema,
+            "PlanningConfiguration": full_planning_configuration_schema,
+            "PlatformStatus": full_platform_status_message_schema,
+            "Acknowledgement": full_acknowledgement_schema,
+        }
     },
     "paths": {
         "/all_messages": {
@@ -49,30 +49,26 @@ swagger_config = {
                             "application/json": {
                                 "schema": {
                                     "oneOf": [
-                                        full_mission_plan_schema,
-                                        full_planning_configuration_schema,
-                                        full_platform_status_message_schema,
-                                        full_observation_schema,
-                                        # {
-                                        #     "$ref": "#/definitions/"
-                                        #     + "Acknowledgement"
-                                        # },
-                                        # {
-                                        #     "$ref": "#/definitions/"
-                                        #     + "MissionPlan"
-                                        # },
-                                        # {
-                                        #     "$ref": "#/definitions/"
-                                        #     + "Observation"
-                                        # },
-                                        # {
-                                        #     "$ref": "#/definitions/"
-                                        #     + "PlanningConfiguration"
-                                        # },
-                                        # {
-                                        #     "$ref": "#/definitions/"
-                                        #     + "PlatformStatus"
-                                        # },
+                                        {
+                                            "$ref": "#/components/schemas/"
+                                            + "Acknowledgement"
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/"
+                                            + "MissionPlan"
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/"
+                                            + "Observation"
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/"
+                                            + "PlanningConfiguration"
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/"
+                                            + "PlatformStatus"
+                                        },
                                     ],
                                     "discriminator": {
                                         "propertyName": "message_type",
@@ -108,7 +104,7 @@ for item in message_types:
                             "schema": {
                                 "allOf": [
                                     {
-                                        "$ref": "#/definitions/" + item,
+                                        "$ref": "#/components/schemas/" + item,
                                     },
                                 ],
                                 "discriminator": {