diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckRadio.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckRadio.cs
index 7f8f7085..149a9e0f 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckRadio.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckRadio.cs
@@ -183,6 +183,12 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolPr
         /// <remarks date="2025-Sep-10" author="Thomas Wiedebusch">
         /// - Load settings from SIRT config file instead from AppConfig. 
         /// </remarks>
+        /// <remarks date="2025-Sep-25" author="Roland Drabesch/Stoyan Slatev">
+        /// - Service SIRT for alarm setup over the air. 
+        /// </remarks>
+        /// <remarks date="2025-Oct-13" author="Thomas Wiedebusch">
+        /// - Service SIRT verbose output and additional error handling and warning. 
+        /// </remarks>
         public override StatusReturn ExecuteProcess()
         {
             // This will force to reset all values, Sentinel and Prepare shipping will fail based on EOL Progress
diff --git a/Common/Ui/GenesisToolBox/frmSetup.Designer.cs b/Common/Ui/GenesisToolBox/frmSetup.Designer.cs
index cb497eb1..8f1b09ee 100644
--- a/Common/Ui/GenesisToolBox/frmSetup.Designer.cs
+++ b/Common/Ui/GenesisToolBox/frmSetup.Designer.cs
@@ -71,6 +71,10 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.cbxSirtService868MHz = new System.Windows.Forms.ComboBox();
+            this.cbxSirtService433MHz = new System.Windows.Forms.ComboBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
             this.cbxSirtComport868MHz = new System.Windows.Forms.ComboBox();
             this.cbxSirtComport433MHz = new System.Windows.Forms.ComboBox();
             this.tbxSirtBoxNo = new System.Windows.Forms.TextBox();
@@ -79,10 +83,6 @@
             this.lblSirtComport433MHz = new System.Windows.Forms.Label();
             this.lblSirtBoxNo = new System.Windows.Forms.Label();
             this.lblSirtStation = new System.Windows.Forms.Label();
-            this.cbxSirtService868MHz = new System.Windows.Forms.ComboBox();
-            this.cbxSirtService433MHz = new System.Windows.Forms.ComboBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvConfig)).BeginInit();
@@ -517,6 +517,40 @@
             this.tabPage5.Text = "SIRT";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
+            // cbxSirtService868MHz
+            // 
+            this.cbxSirtService868MHz.FormattingEnabled = true;
+            this.cbxSirtService868MHz.Location = new System.Drawing.Point(142, 164);
+            this.cbxSirtService868MHz.Name = "cbxSirtService868MHz";
+            this.cbxSirtService868MHz.Size = new System.Drawing.Size(121, 21);
+            this.cbxSirtService868MHz.TabIndex = 13;
+            // 
+            // cbxSirtService433MHz
+            // 
+            this.cbxSirtService433MHz.FormattingEnabled = true;
+            this.cbxSirtService433MHz.Location = new System.Drawing.Point(142, 137);
+            this.cbxSirtService433MHz.Name = "cbxSirtService433MHz";
+            this.cbxSirtService433MHz.Size = new System.Drawing.Size(121, 21);
+            this.cbxSirtService433MHz.TabIndex = 12;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(22, 168);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(114, 13);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "Service Port 868 MHz:";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(22, 140);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(114, 13);
+            this.label7.TabIndex = 10;
+            this.label7.Text = "Service Port 433 MHz:";
+            // 
             // cbxSirtComport868MHz
             // 
             this.cbxSirtComport868MHz.FormattingEnabled = true;
@@ -552,18 +586,18 @@
             this.lblSirtComport868MHz.AutoSize = true;
             this.lblSirtComport868MHz.Location = new System.Drawing.Point(22, 106);
             this.lblSirtComport868MHz.Name = "lblSirtComport868MHz";
-            this.lblSirtComport868MHz.Size = new System.Drawing.Size(95, 13);
+            this.lblSirtComport868MHz.Size = new System.Drawing.Size(103, 13);
             this.lblSirtComport868MHz.TabIndex = 5;
-            this.lblSirtComport868MHz.Text = "Comport 868 MHz:";
+            this.lblSirtComport868MHz.Text = "RSSI Port 868 MHz:";
             // 
             // lblSirtComport433MHz
             // 
             this.lblSirtComport433MHz.AutoSize = true;
             this.lblSirtComport433MHz.Location = new System.Drawing.Point(22, 78);
             this.lblSirtComport433MHz.Name = "lblSirtComport433MHz";
-            this.lblSirtComport433MHz.Size = new System.Drawing.Size(95, 13);
+            this.lblSirtComport433MHz.Size = new System.Drawing.Size(103, 13);
             this.lblSirtComport433MHz.TabIndex = 4;
-            this.lblSirtComport433MHz.Text = "Comport 433 MHz:";
+            this.lblSirtComport433MHz.Text = "RSSI Port 433 MHz:";
             // 
             // lblSirtBoxNo
             // 
@@ -583,40 +617,6 @@
             this.lblSirtStation.TabIndex = 2;
             this.lblSirtStation.Text = "Station ID:";
             // 
-            // cbxSirtService868MHz
-            // 
-            this.cbxSirtService868MHz.FormattingEnabled = true;
-            this.cbxSirtService868MHz.Location = new System.Drawing.Point(142, 164);
-            this.cbxSirtService868MHz.Name = "cbxSirtService868MHz";
-            this.cbxSirtService868MHz.Size = new System.Drawing.Size(121, 21);
-            this.cbxSirtService868MHz.TabIndex = 13;
-            // 
-            // cbxSirtService433MHz
-            // 
-            this.cbxSirtService433MHz.FormattingEnabled = true;
-            this.cbxSirtService433MHz.Location = new System.Drawing.Point(142, 137);
-            this.cbxSirtService433MHz.Name = "cbxSirtService433MHz";
-            this.cbxSirtService433MHz.Size = new System.Drawing.Size(121, 21);
-            this.cbxSirtService433MHz.TabIndex = 12;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(22, 168);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(114, 13);
-            this.label5.TabIndex = 11;
-            this.label5.Text = "Service Port 868 MHz:";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(22, 140);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(114, 13);
-            this.label7.TabIndex = 10;
-            this.label7.Text = "Service Port 433 MHz:";
-            // 
             // FrmSetup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);