diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
index 006e61d50..883f7da1a 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
@@ -927,39 +927,113 @@
       </GPS__PCT__20Mouse>
     </GpsDisplayGadget>
     <HITL>
-      <Flightgear__PCT__20HITL>
+      <AeroSimRC__PCT__20HITL>
         <configInfo>
           <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <binPath>\usr\games\fgfs</binPath>
-          <dataPath>\usr\share\games\FlightGear</dataPath>
-          <hostAddress>127.0.0.1</hostAddress>
-          <inPort>9009</inPort>
-          <manual>false</manual>
-          <outPort>9010</outPort>
-          <remoteHostAddress>127.0.0.1</remoteHostAddress>
-          <simulatorId>FG</simulatorId>
-          <startSim>true</startSim>
-        </data>
+            <version>0.0.0</version>
+          </configInfo>
+          <data>
+            <addNoise>false</addNoise>
+            <attActCalc>false</attActCalc>
+            <attActHW>false</attActHW>
+            <attActSim>true</attActSim>
+            <attActualEnabled>true</attActualEnabled>
+            <attRawEnabled>true</attRawEnabled>
+            <attRawRate>20</attRawRate>
+            <baroAltRate>50</baroAltRate>
+            <baroAltitudeEnabled>false</baroAltitudeEnabled>
+            <binPath></binPath>
+            <dataPath></dataPath>
+            <gcsReceiverEnabled>true</gcsReceiverEnabled>
+            <gpsPosRate>100</gpsPosRate>
+            <gpsPositionEnabled>false</gpsPositionEnabled>
+            <groundTruthEnabled>true</groundTruthEnabled>
+            <groundTruthRate>100</groundTruthRate>
+            <hostAddress>0.0.0.0</hostAddress>
+            <inPort>40100</inPort>
+            <inputCommand>true</inputCommand>
+            <latitude></latitude>
+            <longitude></longitude>
+            <manualControlEnabled>false</manualControlEnabled>
+            <manualOutput>false</manualOutput>
+            <minOutputPeriod>40</minOutputPeriod>
+            <outPort>40200</outPort>
+            <remoteAddress>127.0.0.1</remoteAddress>
+            <simulatorId>ASimRC</simulatorId>
+            <startSim>false</startSim>
+          </data>
+       </AeroSimRC__PCT__20HITL>
+       <Flightgear__PCT__20HITL>
+          <configInfo>
+            <locked>false</locked>
+            <version>0.0.0</version>
+          </configInfo>
+          <data>
+            <addNoise>false</addNoise>
+            <attActCalc>false</attActCalc>
+            <attActHW>false</attActHW>
+            <attActSim>true</attActSim>
+            <attActualEnabled>true</attActualEnabled>
+            <attRawEnabled>true</attRawEnabled>
+            <attRawRate>20</attRawRate>
+            <baroAltRate>50</baroAltRate>
+            <baroAltitudeEnabled>false</baroAltitudeEnabled>
+            <binPath>\usr\games\fgfs</binPath>
+            <dataPath>\usr\share\games\FlightGear</dataPath>
+            <gcsReceiverEnabled>false</gcsReceiverEnabled>
+            <gpsPosRate>100</gpsPosRate>
+            <gpsPositionEnabled>false</gpsPositionEnabled>
+            <groundTruthEnabled>true</groundTruthEnabled>
+            <groundTruthRate>100</groundTruthRate>
+            <hostAddress>127.0.0.1</hostAddress>
+            <inPort>9009</inPort>
+            <inputCommand>true</inputCommand>
+            <latitude></latitude>
+            <longitude></longitude>
+            <manualControlEnabled>true</manualControlEnabled>
+            <manualOutput>false</manualOutput>
+            <minOutputPeriod>40</minOutputPeriod>
+            <outPort>9010</outPort>
+            <remoteAddress>127.0.0.1</remoteAddress>
+            <simulatorId>FG</simulatorId>
+            <startSim>true</startSim>
+          </data>
       </Flightgear__PCT__20HITL>
-      <XPlane__PCT__20HITL>
-        <configInfo>
-          <locked>false</locked>
-          <version>0.0.0</version>
-        </configInfo>
-        <data>
-          <binPath>\home\lafargue\X-Plane 9\X-Plane-i686</binPath>
-          <dataPath>\usr\share\games\FlightGear</dataPath>
-          <hostAddress>127.0.0.3</hostAddress>
-          <inPort>6756</inPort>
-          <manual>false</manual>
-          <outPort>49000</outPort>
-          <remoteHostAddress>127.0.0.1</remoteHostAddress>
-          <simulatorId>X-Plane</simulatorId>
-          <startSim>false</startSim>
-        </data>
+       <XPlane__PCT__20HITL>
+          <configInfo>
+            <locked>false</locked>
+            <version>0.0.0</version>
+          </configInfo>
+          <data>
+            <addNoise>false</addNoise>
+            <attActCalc>false</attActCalc>
+            <attActHW>false</attActHW>
+            <attActSim>true</attActSim>
+            <attActualEnabled>true</attActualEnabled>
+            <attRawEnabled>true</attRawEnabled>
+            <attRawRate>20</attRawRate>
+            <baroAltRate>50</baroAltRate>
+            <baroAltitudeEnabled>false</baroAltitudeEnabled>
+            <binPath></binPath>
+            <dataPath></dataPath>
+            <gcsReceiverEnabled>false</gcsReceiverEnabled>
+            <gpsPosRate>100</gpsPosRate>
+            <gpsPositionEnabled>false</gpsPositionEnabled>
+            <groundTruthEnabled>true</groundTruthEnabled>
+            <groundTruthRate>100</groundTruthRate>
+            <hostAddress>0.0.0.0</hostAddress>
+            <inPort>6756</inPort>
+            <inputCommand>true</inputCommand>
+            <latitude></latitude>
+            <longitude></longitude>
+            <manualControlEnabled>true</manualControlEnabled>
+            <manualOutput>false</manualOutput>
+            <minOutputPeriod>40</minOutputPeriod>
+            <outPort>49000</outPort>
+            <remoteAddress>127.0.0.1</remoteAddress>
+            <simulatorId>X-Plane</simulatorId>
+            <startSim>false</startSim>
+          </data>
       </XPlane__PCT__20HITL>
     </HITL>
     <HITLv2>
diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
index 9ecb4097b..d685cae24 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
@@ -955,7 +955,7 @@
       </GPS__PCT__20Mouse>
     </GpsDisplayGadget>
     <HITL>
-      <AeroSimRC>
+      <AeroSimRC__PCT__20HITL>
         <configInfo>
           <locked>false</locked>
           <version>0.0.0</version>
@@ -970,8 +970,8 @@
           <attRawRate>20</attRawRate>
           <baroAltRate>50</baroAltRate>
           <baroAltitudeEnabled>false</baroAltitudeEnabled>
-          <binPath>\home\lafargue\X-Plane 9\X-Plane-i686</binPath>
-          <dataPath>\usr\share\games\FlightGear</dataPath>
+          <binPath></binPath>
+          <dataPath></dataPath>
           <gcsReceiverEnabled>true</gcsReceiverEnabled>
           <gpsPosRate>100</gpsPosRate>
           <gpsPositionEnabled>false</gpsPositionEnabled>
@@ -990,7 +990,7 @@
           <simulatorId>ASimRC</simulatorId>
           <startSim>false</startSim>
         </data>
-      </AeroSimRC>
+      </AeroSimRC__PCT__20HITL>
       <Flightgear__PCT__20HITL>
         <configInfo>
           <locked>false</locked>
@@ -1042,8 +1042,8 @@
           <attRawRate>20</attRawRate>
           <baroAltRate>50</baroAltRate>
           <baroAltitudeEnabled>false</baroAltitudeEnabled>
-          <binPath>\home\lafargue\X-Plane 9\X-Plane-i686</binPath>
-          <dataPath>\usr\share\games\FlightGear</dataPath>
+          <binPath></binPath>
+          <dataPath></dataPath>
           <gcsReceiverEnabled>false</gcsReceiverEnabled>
           <gpsPosRate>100</gpsPosRate>
           <gpsPositionEnabled>false</gpsPositionEnabled>