diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
index a9676ff5..eeee9a8c 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
@@ -1157,7 +1157,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
         /// - FW-Update SW container added.
         /// </remarks>
         /// <remarks date="2021-Mar-24" author="Thomas Wiedebusch">
-        /// - Order number and customer text added added,
+        /// - Order number and customer text added,
         /// - Disable all controls during FW-UpdateSafe build.
         /// </remarks>
         /// <remarks date="2021-Mar-26" author="Thomas Wiedebusch">
@@ -1182,7 +1182,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
         /// - Added FwUpdateSafeDb preparation
         /// </remarks>
         /// <remarks date="2021-Oct-27" author="Thomas Wiedebusch">
-        /// - Added BuildFwUpdateSwContainerFromDb, not longer taken from locally file system!
+        /// - Added BuildFwUpdateSwContainerFromDb, no longer taken from locally file system!
         /// </remarks>
         /// <remarks date="2021-Oct-29" author="Thomas Wiedebusch">
         /// - Skip loading of FW update SW if already done in preceding run.
@@ -1563,7 +1563,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
             if (cordonelDbInfo == null)
                 return Constants.StrUnknown;
 
-            // preset to not approved to leave the approval open for user in the "pre build summary" tab
+            // preset to not approved to leave the approval open for user in the "pre-build summary" tab
             cordonelDbInfo.IsRemoved = true;
             cordonelDbInfo.IsApproved = false;
             cordonelDbInfo.RequiredReleaseNameVersion = null;
@@ -3126,6 +3126,9 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
         /// <remarks date="2024-May-13" author="Thomas Wiedebusch">
         /// - Disabled language selection, culture info fixed to english.
         /// </remarks>
+        /// <remarks date="2025-Oct-01" author="Thomas Wiedebusch">
+        /// - Avoid unreleased versions.
+        /// </remarks>
         private void FillDataGridWithFwPackageInfos()
         {
             grpLanguageSelection.Enabled = false;
@@ -3181,7 +3184,9 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
                           (fw.CoreRevisionMax != null && requiredCoreVersion > fw.CoreRevisionMax)) &&
                          cbxFwPackageCoreMak.Text != Constants.StrWildcard) ||
                         (fw.MetrologyVersion != requiredMetrologyVersion &&
-                         cbxFwPackageMetrologyMask.Text != Constants.StrWildcard))
+                         cbxFwPackageMetrologyMask.Text != Constants.StrWildcard) ||
+                        // Avoid unreleased versions
+                        !fw.IsReleased)
                         continue;
 
                     var row = _dataTableFwPackages.NewRow();