diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/70000_gz_atmos b/ROMFS/px4fmu_common/init.d-posix/airframes/70000_gz_atmos
index c17a92a305..c539586ae5 100644
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/70000_gz_atmos
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/70000_gz_atmos
@@ -1,10 +1,21 @@
 #!/bin/sh
 #
-# @name 3DoF Spacecraft Model
+# @name KTH-ATMOS
 #
-# @type 2D Freeflyer with 8 thrusters - Planar motion
+# @type Free-Flyer
+# @class Spacecraft
 #
-# @maintainer Pedro Roque <padr@kth.se>
+# @output Motor1 back left thruster, +x thrust
+# @output Motor2 front left thruster, -x thrust
+# @output Motor3 back right thruster, +x thrust
+# @output Motor4 front right thruster, -x thrust
+# @output Motor5 front left thruster, +y thrust
+# @output Motor6 front right thruster, -y thrust
+# @output Motor7 back left thruster, +y thrust
+# @output Motor8 back right thruster, -y thrust
+#
+# @maintainer discower-io
+# @url https://atmos.discower.io
 #
 
 . ${R}etc/init.d/rc.sc_defaults
diff --git a/ROMFS/px4fmu_common/init.d/airframes/70000_atmos b/ROMFS/px4fmu_common/init.d/airframes/70000_atmos
index 0a7e809ad1..37b676cef1 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/70000_atmos
+++ b/ROMFS/px4fmu_common/init.d/airframes/70000_atmos
@@ -5,7 +5,17 @@
 # @type Free-Flyer
 # @class Spacecraft
 #
+# @output Motor1 back left thruster, +x thrust
+# @output Motor2 front left thruster, -x thrust
+# @output Motor3 back right thruster, +x thrust
+# @output Motor4 front right thruster, -x thrust
+# @output Motor5 front left thruster, +y thrust
+# @output Motor6 front right thruster, -y thrust
+# @output Motor7 back left thruster, +y thrust
+# @output Motor8 back right thruster, -y thrust
+#
 # @maintainer DISCOWER
+# @url https://atmos.discower.io
 #
 
 . ${R}etc/init.d/rc.sc_defaults
diff --git a/Tools/px4airframes/srcparser.py b/Tools/px4airframes/srcparser.py
index 56c3ce52be..dc60cfa7fe 100644
--- a/Tools/px4airframes/srcparser.py
+++ b/Tools/px4airframes/srcparser.py
@@ -14,7 +14,6 @@ class AirframeGroup(object):
         self.af_class = af_class
         self.airframes = []
 
-
     def AddAirframe(self, airframe):
         """
         Add airframe to the airframe group
@@ -107,6 +106,8 @@ class AirframeGroup(object):
             return "Balloon"
         elif (self.type == "Vectored 6 DOF UUV"):
             return "Vectored6DofUUV"
+        elif self.type == "Free-Flyer":
+            return "FreeFlyer"
         return "AirframeUnknown"
 
     def GetAirframes(self):
diff --git a/docs/assets/airframes/types/FreeFlyer.svg b/docs/assets/airframes/types/FreeFlyer.svg
new file mode 100644
index 0000000000..aba991c424
--- /dev/null
+++ b/docs/assets/airframes/types/FreeFlyer.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="draw"
+   x="0px"
+   y="0px"
+   viewBox="0 0 291.424 291.77"
+   enable-background="new 0 0 291.424 291.77"
+   xml:space="preserve"
+   sodipodi:docname="FreeFlyer.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata13908"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>QuadRotorX</dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs13906"><rect
+     x="64.295094"
+     y="257.16159"
+     width="20.004284"
+     height="19.434001"
+     id="rect1674" /><rect
+     x="57.181928"
+     y="12.768183"
+     width="21.455602"
+     height="14.069247"
+     id="rect1668" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-3" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-6" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-8" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0-3" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0-5" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1131"
+   id="namedview13904"
+   showgrid="true"
+   showguides="false"
+   inkscape:zoom="2"
+   inkscape:cx="37"
+   inkscape:cy="143.75"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="draw"
+   inkscape:showpageshadow="2"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"><inkscape:grid
+     type="xygrid"
+     id="grid14610" /></sodipodi:namedview><title
+   id="title13869">QuadRotorX</title>
+     <rect
+   style="fill:#4ec3e8;fill-opacity:0.8;stroke-width:0.703099"
+   id="rect866"
+   width="182.87863"
+   height="182.87863"
+   x="54.336742"
+   y="54.008221" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 41.75804,283.31181 64.75142,-0.1091 -34.35904,-46.53234"
+   id="path978" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 8.0625538,189.05596 0.1091,64.75142 46.5323452,-34.35904"
+   id="path978-3" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 7.6111718,42.233006 0.1091,64.751414 46.5323442,-34.359034"
+   id="path978-3-5" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="M 283.3143,102.92315 283.2052,38.171731 236.67284,72.530766"
+   id="path978-3-0" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 283.76568,249.7461 -0.1091,-64.75142 -46.53235,34.35904"
+   id="path978-3-5-9" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 186.0159,282.76127 64.75142,-0.1091 -34.35904,-46.53235"
+   id="path978-5" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 249.48837,7.3723165 -64.75142,0.1091 34.35904,46.5323455"
+   id="path978-6" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="M 105.23051,7.9228645 40.479095,8.0319644 74.838131,54.56431"
+   id="path978-5-2" /><path
+   fill="#ffffff"
+   stroke="#000000"
+   stroke-miterlimit="10"
+   d="m 177.46535,152.08429 -25.44869,25.44869 c -2.72029,2.72029 -7.13013,2.72029 -9.84972,0 l -25.44868,-25.44869 c -2.7203,-2.72029 -2.7203,-7.13013 0,-9.84972 l 25.44868,-25.44868 c 2.72029,-2.72029 7.13013,-2.72029 9.84972,0 l 25.44869,25.44868 c 2.72029,2.72029 2.72029,7.13013 0,9.84972 z"
+   id="path13875-2"
+   style="stroke-width:0.703099" /><polygon
+   fill="#ff442b"
+   stroke="#000000"
+   stroke-miterlimit="10"
+   points="145.645,117.211 163.823,168.211 127.468,168.211 "
+   id="polygon13877-7"
+   transform="matrix(0.70309945,0,0,0.70309945,44.68853,44.358917)" /><text
+   xml:space="preserve"
+   id="text1666"
+   style="fill:#ffffff;fill-opacity:0.80000001;white-space:pre;shape-inside:url(#rect1668)" /><text
+   xml:space="preserve"
+   id="text1672"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674);fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-56.149908,-232.98716)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2022">1</tspan></text><text
+   xml:space="preserve"
+   id="text1672-6"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-3);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-54.90599,-471.96664)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2024">2</tspan></text><text
+   xml:space="preserve"
+   id="text1672-1"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-6);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,88.181331,-233.48182)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2026">3</tspan></text><text
+   xml:space="preserve"
+   id="text1672-7"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-8);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,89.923516,-472.9994)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2028">4</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-107.88311,-425.85878)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2030">5</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,140.31603,-426.60417)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2032">6</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2-7"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0-3);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-106.57328,-277.85487)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2034">7</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2-9"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0-5);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,140.59859,-279.63807)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2036">8</tspan></text></svg>