diff --git a/yaml_templates/processor/GnssOptions.yaml b/yaml_templates/processor/GnssUtilsOptions.yaml
similarity index 96%
rename from yaml_templates/processor/GnssOptions.yaml
rename to yaml_templates/processor/GnssUtilsOptions.yaml
index 4452a8e6a2d73db4c796abf2bc8e78c35594cd8a..2709873514f080cffc057f30700b8b293d36b462 100644
--- a/yaml_templates/processor/GnssOptions.yaml
+++ b/yaml_templates/processor/GnssUtilsOptions.yaml
@@ -2,7 +2,6 @@ sateph: 0  # DOC satellite ephemeris option: EPHOPT_BRDC(0):broadcast ephemeris,
 ionoopt: 0  # DOC ionosphere option: IONOOPT_OFF(0):correction off, IONOOPT_BRDC(1):broadcast mode, IONOOPT_SBAS(2):SBAS model, IONOOPT_IFLC(3):L1/L2 or L1/L5, IONOOPT_EST(4):estimation, IONOOPT_TEC(5):IONEX TEC model, IONOOPT_QZS(6):QZSS broadcast, IONOOPT_LEX(7):QZSS LEX ionosphere, IONOOPT_STEC(8):SLANT TEC mode, IONOOPT_SBAS2(9):broadcast + SBAS(sats with SBAS corr and sats with BRDC eph), IONOOPT_SBAS3(10): IONOOPT_SBAS if possible, otherwise IONOOPT_SBAS2 (IONOOPT_SBAS + broadcast), IONOOPT_SBAS4(11): IONOOPT_SBAS if possible, otherwise IONOOPT_BRDC - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 tropopt: 0  # DOC troposphere option: TROPOPT_OFF(0):correction off, TROPOPT_SAAS(1):Saastamoinen model, TROPOPT_SBAS(2):SBAS model, TROPOPT_EST(3):troposphere option: ZTD estimation, TROPOPT_ESTG(4):ZTD+grad estimation, TROPOPT_ZTD(5):ZTD correction,6:ZTD+grad correction - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5]
 sbascorr: 0  # DOC SBAS correction options (can be added): SBSOPT_LCORR(1): long term correction, SBSOPT_FCORR(2): fast correction, SBSOPT_ICORR(4): ionosphere correction, SBSOPT_RANGE(8): ranging - TYPE int - OPTIONS [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
-apply_sagnac_correction: true  # OPTIONAL - DOC if the Sagnac correction is applied. - TYPE bool
 min_sbas_sats: 4  # OPTIONAL - DOC threshold of minimum satellites in the variable modes EPHOPT_SBAS3, EPHOPT_SBAS4, IONOOPT_SBAS3 and IONOOPT_SBAS4 - TYPE int
 raim: 0  # DOC amount of satellites removed by RAIM - TYPE int
 elmin: 0.0  # DOC minimum satellite elevation (rad) to be used in the solution - TYPE double
diff --git a/yaml_templates/processor/ProcessorGnssFix.yaml b/yaml_templates/processor/ProcessorGnssFix.yaml
index 6c950954cee1ca4b1a205547ebcca4633961cfce..7d42ac571197bccd27fb915f6ef9d1cfb506f6f4 100644
--- a/yaml_templates/processor/ProcessorGnssFix.yaml
+++ b/yaml_templates/processor/ProcessorGnssFix.yaml
@@ -20,7 +20,6 @@ fix_options:
   ionoopt: 0  # DOC ionosphere option: IONOOPT_OFF(0):correction off, IONOOPT_BRDC(1):broadcast mode, IONOOPT_SBAS(2):SBAS model, IONOOPT_IFLC(3):L1/L2 or L1/L5, IONOOPT_EST(4):estimation, IONOOPT_TEC(5):IONEX TEC model, IONOOPT_QZS(6):QZSS broadcast, IONOOPT_LEX(7):QZSS LEX ionosphere, IONOOPT_STEC(8):SLANT TEC mode, IONOOPT_SBAS2(9):broadcast + SBAS(sats with SBAS corr and sats with BRDC eph), IONOOPT_SBAS3(10): IONOOPT_SBAS if possible, otherwise IONOOPT_SBAS2 (IONOOPT_SBAS + broadcast), IONOOPT_SBAS4(11): IONOOPT_SBAS if possible, otherwise IONOOPT_BRDC - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
   tropopt: 0  # DOC troposphere option: TROPOPT_OFF(0):correction off, TROPOPT_SAAS(1):Saastamoinen model, TROPOPT_SBAS(2):SBAS model, TROPOPT_EST(3):troposphere option: ZTD estimation, TROPOPT_ESTG(4):ZTD+grad estimation, TROPOPT_ZTD(5):ZTD correction,6:ZTD+grad correction - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5]
   sbascorr: 0  # DOC SBAS correction options (can be added): SBSOPT_LCORR(1): long term correction, SBSOPT_FCORR(2): fast correction, SBSOPT_ICORR(4): ionosphere correction, SBSOPT_RANGE(8): ranging - TYPE int - OPTIONS [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
-  apply_sagnac_correction: true  # OPTIONAL - DOC if the Sagnac correction is applied. - TYPE bool
   min_sbas_sats: 4  # OPTIONAL - DOC threshold of minimum satellites in the variable modes EPHOPT_SBAS3, EPHOPT_SBAS4, IONOOPT_SBAS3 and IONOOPT_SBAS4 - TYPE int
   raim: 0  # DOC amount of satellites removed by RAIM - TYPE int
   elmin: 0.0  # DOC minimum satellite elevation (rad) to be used in the solution - TYPE double
diff --git a/yaml_templates/processor/ProcessorGnssTdcp.yaml b/yaml_templates/processor/ProcessorGnssTdcp.yaml
index 88a13120711e1efe72c4370885a2993aaca76f1a..8d5e10db3437bf90d12ca33fd8a79d7ca46e578d 100644
--- a/yaml_templates/processor/ProcessorGnssTdcp.yaml
+++ b/yaml_templates/processor/ProcessorGnssTdcp.yaml
@@ -20,7 +20,6 @@ fix_options:
   ionoopt: 0  # DOC ionosphere option: IONOOPT_OFF(0):correction off, IONOOPT_BRDC(1):broadcast mode, IONOOPT_SBAS(2):SBAS model, IONOOPT_IFLC(3):L1/L2 or L1/L5, IONOOPT_EST(4):estimation, IONOOPT_TEC(5):IONEX TEC model, IONOOPT_QZS(6):QZSS broadcast, IONOOPT_LEX(7):QZSS LEX ionosphere, IONOOPT_STEC(8):SLANT TEC mode, IONOOPT_SBAS2(9):broadcast + SBAS(sats with SBAS corr and sats with BRDC eph), IONOOPT_SBAS3(10): IONOOPT_SBAS if possible, otherwise IONOOPT_SBAS2 (IONOOPT_SBAS + broadcast), IONOOPT_SBAS4(11): IONOOPT_SBAS if possible, otherwise IONOOPT_BRDC - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
   tropopt: 0  # DOC troposphere option: TROPOPT_OFF(0):correction off, TROPOPT_SAAS(1):Saastamoinen model, TROPOPT_SBAS(2):SBAS model, TROPOPT_EST(3):troposphere option: ZTD estimation, TROPOPT_ESTG(4):ZTD+grad estimation, TROPOPT_ZTD(5):ZTD correction,6:ZTD+grad correction - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5]
   sbascorr: 0  # DOC SBAS correction options (can be added): SBSOPT_LCORR(1): long term correction, SBSOPT_FCORR(2): fast correction, SBSOPT_ICORR(4): ionosphere correction, SBSOPT_RANGE(8): ranging - TYPE int - OPTIONS [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
-  apply_sagnac_correction: true  # OPTIONAL - DOC if the Sagnac correction is applied. - TYPE bool
   min_sbas_sats: 4  # OPTIONAL - DOC threshold of minimum satellites in the variable modes EPHOPT_SBAS3, EPHOPT_SBAS4, IONOOPT_SBAS3 and IONOOPT_SBAS4 - TYPE int
   raim: 0  # DOC amount of satellites removed by RAIM - TYPE int
   elmin: 0.0  # DOC minimum satellite elevation (rad) to be used in the solution - TYPE double
diff --git a/yaml_templates/processor/ProcessorTrackerGnss.yaml b/yaml_templates/processor/ProcessorTrackerGnss.yaml
index e0ac637a3c15c84d5d55ad1b38d34036f76ef630..f3228b2091d091f647f9ca8195e7c6a52971224d 100644
--- a/yaml_templates/processor/ProcessorTrackerGnss.yaml
+++ b/yaml_templates/processor/ProcessorTrackerGnss.yaml
@@ -17,7 +17,6 @@ gnss_options:
   ionoopt: 0  # DOC ionosphere option: IONOOPT_OFF(0):correction off, IONOOPT_BRDC(1):broadcast mode, IONOOPT_SBAS(2):SBAS model, IONOOPT_IFLC(3):L1/L2 or L1/L5, IONOOPT_EST(4):estimation, IONOOPT_TEC(5):IONEX TEC model, IONOOPT_QZS(6):QZSS broadcast, IONOOPT_LEX(7):QZSS LEX ionosphere, IONOOPT_STEC(8):SLANT TEC mode, IONOOPT_SBAS2(9):broadcast + SBAS(sats with SBAS corr and sats with BRDC eph), IONOOPT_SBAS3(10): IONOOPT_SBAS if possible, otherwise IONOOPT_SBAS2 (IONOOPT_SBAS + broadcast), IONOOPT_SBAS4(11): IONOOPT_SBAS if possible, otherwise IONOOPT_BRDC - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
   tropopt: 0  # DOC troposphere option: TROPOPT_OFF(0):correction off, TROPOPT_SAAS(1):Saastamoinen model, TROPOPT_SBAS(2):SBAS model, TROPOPT_EST(3):troposphere option: ZTD estimation, TROPOPT_ESTG(4):ZTD+grad estimation, TROPOPT_ZTD(5):ZTD correction,6:ZTD+grad correction - TYPE int - OPTIONS [0, 1, 2, 3, 4, 5]
   sbascorr: 0  # DOC SBAS correction options (can be added): SBSOPT_LCORR(1): long term correction, SBSOPT_FCORR(2): fast correction, SBSOPT_ICORR(4): ionosphere correction, SBSOPT_RANGE(8): ranging - TYPE int - OPTIONS [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
-  apply_sagnac_correction: true  # OPTIONAL - DOC if the Sagnac correction is applied. - TYPE bool
   min_sbas_sats: 4  # OPTIONAL - DOC threshold of minimum satellites in the variable modes EPHOPT_SBAS3, EPHOPT_SBAS4, IONOOPT_SBAS3 and IONOOPT_SBAS4 - TYPE int
   raim: 0  # DOC amount of satellites removed by RAIM - TYPE int
   elmin: 0.0  # DOC minimum satellite elevation (rad) to be used in the solution - TYPE double