diff --git a/conf/airframes/TUDELFT/tudelft_conf.xml b/conf/airframes/TUDELFT/tudelft_conf.xml
index e128b89773..da3855af3f 100644
--- a/conf/airframes/TUDELFT/tudelft_conf.xml
+++ b/conf/airframes/TUDELFT/tudelft_conf.xml
@@ -183,7 +183,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
    settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/geo_mag.xml modules/air_data.xml modules/gps_ubx_ucenter.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/ahrs_int_cmpl_quat.xml modules/geo_mag.xml modules/air_data.xml"
    gui_color="#ffffdffac31f"
   />
   <aircraft
diff --git a/conf/airframes/TUDELFT/tudelft_iris_indi.xml b/conf/airframes/TUDELFT/tudelft_iris_indi.xml
index 796ef453b9..0dca8058b3 100644
--- a/conf/airframes/TUDELFT/tudelft_iris_indi.xml
+++ b/conf/airframes/TUDELFT/tudelft_iris_indi.xml
@@ -23,6 +23,7 @@
     <module name="telemetry" type="transparent" />
     <module name="imu" type="px4fmu_v2.4"/>
     <module name="gps" type="ublox" />
+    <module name="gps" type="ubx_ucenter" />
     <module name="stabilization" type="indi" />
     <module name="ahrs" type="int_cmpl_quat" >
       <define name="AHRS_ICQ_IMU_ID" value="IMU_PX4_ID" />         <!-- Meaning the lsm303 and l3g -->
@@ -87,7 +88,6 @@
     <module name="geo_mag" />
     <module name="air_data" />
     <module name="send_imu_mag_current" />
-    <module name="gps" type="ubx_ucenter" />
     <module name="mag" type="hmc58xx">
       <configure name="MAG_HMC58XX_I2C_DEV" value="i2c1"/>
       <define name="MODULE_HMC58XX_UPDATE_AHRS" value="TRUE"/>
diff --git a/conf/airframes/TUDELFT/tudelft_logo600.xml b/conf/airframes/TUDELFT/tudelft_logo600.xml
index eb4846b91c..82f8486825 100644
--- a/conf/airframes/TUDELFT/tudelft_logo600.xml
+++ b/conf/airframes/TUDELFT/tudelft_logo600.xml
@@ -32,6 +32,7 @@ The xml in master currently configures the LOGO600 as a pure model aircraft: mea
       <configure name="GPS_PORT" value="UART4"/>
       <configure name="GPS_BAUD" value="B115200"/>
     </module>
+    <module name="gps" type="ubx_ucenter"/>
     <module name="stabilization" type="int_quat"/>
     <module name="ahrs"          type="int_cmpl_quat"/>
     <module name="ins"           type="hff"/>
@@ -70,7 +71,6 @@ The xml in master currently configures the LOGO600 as a pure model aircraft: mea
     <module name="geo_mag"/>
     <module name="air_data"/>
     <module name="logger_spi_link"/>
-    <module name="gps" type="ubx_ucenter"/>
   </modules>
 
   <servos driver="Spektrum">