diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
index f15464a90..bf84b7bca 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
index 9fd04d48c..ddd566a77 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "Tarot_X4"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
index 22bf52a66..acbd25c5a 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
index c295d62ec..a1ec208c3 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "ReadyToSkyZD550"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/10_gnss.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/10_gnss.param
index 728171e2b..7b0ffa42e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/10_gnss.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/10_gnss.param
@@ -4,5 +4,6 @@ GPS_POS1_X,0.056  # HX-CH7604A GNSS antenna pahse center location relative to CG
 GPS_POS1_Y,0  # HX-CH7604A GNSS antenna pahse center location relative to CG
 GPS_POS1_Z,-0.07  # HX-CH7604A GNSS antenna pahse center location relative to CG
 GPS_TYPE,2  # Defined in component editor
+GPS1_TYPE,2  # Defined in component editor
 SERIAL3_PROTOCOL,5  # GNSS receiver is connected to serial3
 WPNAV_RADIUS,200  # we have a good GNSS receiver so we can afford to fly precisely
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
index 43145110f..f24158082 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "4.5.x-params"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
index 7b554ecf2..ec9bc7746 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna"
         }
     },
-    "Program version": "2.5.0"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
index 5c9104ab7..a3f2a98e0 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna"
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "X11_plus"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
index 1d05a4752..2e7b2f402 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "Holybro_X500_V2"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
index b4dc26453..cbbf50f24 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": "mk32 COMBO RADIO "
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "Hoverit_X11+"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
index a5306aa5e..a8971b2a2 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": "mk32 COMBO RADIO"
         }
     },
-    "Program version": "2.0.1",
+    "Program version": "2.8.3",
     "Configuration template": "Hoverit_X11+"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
index 584a3a5f2..01a27f654 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
index cadded6e9..aad50f348 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
index f1bc9bcd6..4615eaee7 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": "UART1 For Telemetry Module. Bluetooth Telem is UART8."
         }
     },
-    "Program version": "2.3.0",
+    "Program version": "2.8.3",
     "Configuration template": "Holybro_X500_V2"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
index b1102ea3e..504a6b5d1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap ESP Now based alternative to the more commonly used 3DR and RFDesigns telemetry modems. Custom developed firmware."
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
index 947bcc592..aaae35dfe 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "High range and strength telemetry."
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
index 949c23ed1..5f3a8b5bb 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
index 5d075888a..43cb61058 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
index c95b952c9..730dc4b3d 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
index 0f028a522..10acfe0e5 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
index 66605a72e..a5df11b98 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.6"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/10_gnss.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/10_gnss.param
index a11cd606b..e2cff70bd 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/10_gnss.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/10_gnss.param
@@ -6,7 +6,7 @@ GPS1_GNSS_MODE,0
 GPS1_POS_X,0
 GPS1_POS_Y,0
 GPS1_POS_Z,0
-GPS1_TYPE,1
+GPS1_TYPE,1  # Defined in component editor
 GPS2_POS_X,0
 GPS2_POS_Y,0
 GPS2_POS_Z,0
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
index 89fca9378..7bb3c3fde 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.6"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
index df5bead3b..4e4889abe 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
index 79e57bdaa..188240c6d 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
@@ -183,5 +183,5 @@
             "Notes": "Integrated in the herelink controller and airunit"
         }
     },
-    "Program version": "2.0.1"
+    "Program version": "2.8.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
index 4976d4316..7d7c3bf1a 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
@@ -183,6 +183,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.8.0",
+    "Program version": "2.8.3",
     "Configuration template": "AION_R1"
 }