diff --git a/ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor b/ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor
index 783b6463919c..c80bd603470e 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor
+++ b/ROMFS/px4fmu_common/init.d/airframes/13030_generic_vtol_quad_tiltrotor
@@ -5,8 +5,6 @@
 # @type VTOL Tiltrotor
 # @class VTOL
 #
-# @maintainer
-#
 # @board px4_fmu-v2 exclude
 # @board bitcraze_crazyflie exclude
 # @board holybro_kakutef7 exclude
diff --git a/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu b/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu
index fe40b95aa034..a9ada60b4262 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu
+++ b/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu
@@ -5,7 +5,6 @@
 # @type Quadrotor x
 # @class Copter
 #
-# @maintainer
 # @board px4_fmu-v2 exclude
 # @board cuav_x7pro exclude
 # @board px4_fmu-v4pro exclude
diff --git a/ROMFS/px4fmu_common/init.d/airframes/59000_generic_ground_vehicle b/ROMFS/px4fmu_common/init.d/airframes/59000_generic_ground_vehicle
index 078ea7859d8b..c8d7bce28978 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/59000_generic_ground_vehicle
+++ b/ROMFS/px4fmu_common/init.d/airframes/59000_generic_ground_vehicle
@@ -8,8 +8,6 @@
 # @output Motor1 throttle
 # @output Servo1 steering
 #
-# @maintainer
-#
 # @board bitcraze_crazyflie exclude
 #
 
diff --git a/Tools/px4airframes/srcparser.py b/Tools/px4airframes/srcparser.py
index 56c3ce52be16..8da0cabf2749 100644
--- a/Tools/px4airframes/srcparser.py
+++ b/Tools/px4airframes/srcparser.py
@@ -391,7 +391,7 @@ def Parse(self, path, contents):
 
         # Process parsed content
         airframe_type = None
-        maintainer = "John Doe <john@example.com>"
+        maintainer = None
         airframe_name = None
         airframe_class = None