diff --git a/build/installer.full.iss b/build/installer.full.iss
index 9b327c0..eb75220 100644
--- a/build/installer.full.iss
+++ b/build/installer.full.iss
@@ -1,7 +1,7 @@
 #define MyAppVersion GetFileVersion("..\dist-azaion\Azaion.Suite.exe")
 
 #ifndef MY_BUILD_ENV
-#define MY_BUILD_ENV "Stage" ; За замовчуванням Stage, якщо не вказано
+  #define MY_BUILD_ENV "Stage" ; Stage by default
 #endif
 
 [Setup]
@@ -13,13 +13,7 @@ AppPublisher=Azaion LLC
 DefaultDirName={localappdata}\Azaion\Azaion Suite
 DefaultGroupName=Azaion Suite
 OutputDir=..\
-
-#if MY_BUILD_ENV == "Prod"
-OutputBaseFilename=AzaionSuite.Full.Prod.{#MyAppVersion}
-#else
-OutputBaseFilename=AzaionSuite.Full.Stage.{#MyAppVersion} ; За замовчуванням Stage
-#endif
-
+OutputBaseFilename=AzaionSuite.Iterative.{#MY_BUILD_ENV}.{#MyAppVersion}
 SetupIconFile=..\dist-azaion\logo.ico
 UninstallDisplayName=Azaion Suite
 UninstallDisplayIcon={app}\Azaion.Suite.exe
diff --git a/build/installer.iterative.iss b/build/installer.iterative.iss
index 4ca904b..d5b59be 100644
--- a/build/installer.iterative.iss
+++ b/build/installer.iterative.iss
@@ -1,10 +1,7 @@
 #define MyAppVersion GetFileVersion("..\dist-azaion\Azaion.Suite.exe")
 
-; Define a variable for the build environment, e.g., "Stage" or "Prod"
-; This will be set by your Jenkins pipeline using the /D switch.
-; If not defined via /D, it defaults to "Stage".
 #ifndef MY_BUILD_ENV
-#define MY_BUILD_ENV "Stage" ; Default to Stage if not specified (e.g., when compiling manually without /D)
+  #define MY_BUILD_ENV "Stage" ; Stage by default
 #endif
 
 [Setup]
@@ -16,14 +13,7 @@ AppPublisher=Azaion LLC
 DefaultDirName={localappdata}\Azaion\Azaion Suite
 DefaultGroupName=Azaion Suite
 OutputDir=..\
-
-; Conditional OutputBaseFilename based on MY_BUILD_ENV
-#if MY_BUILD_ENV == "Prod"
-OutputBaseFilename=AzaionSuite.Iterative.Prod.{#MyAppVersion}
-#else
-OutputBaseFilename=AzaionSuite.Iterative.Stage.{#MyAppVersion} ; Defaults to Stage if MY_BUILD_ENV is not "Prod"
-#endif
-
+OutputBaseFilename=AzaionSuite.Iterative.{#MY_BUILD_ENV}.{#MyAppVersion}
 SetupIconFile=..\dist-azaion\logo.ico
 UninstallDisplayName=Azaion Suite
 UninstallDisplayIcon={app}\Azaion.Suite.exe