diff --git a/InfrastructureAgent/windows/app-amd64-template.wxs b/InfrastructureAgent/windows/app-amd64-template.wxs
index 8778e3abd7..16b65cd5cb 100644
--- a/InfrastructureAgent/windows/app-amd64-template.wxs
+++ b/InfrastructureAgent/windows/app-amd64-template.wxs
@@ -47,7 +47,6 @@
                             Source='binary_placeholder'
                             KeyPath='yes'
                         />
-                        <Environment Id='PATH' Name='PATH' Value='[INSTALLDIR]' Permanent='no' Part='last' Action='set' />
                     </Component>
                 </Directory>
             </Directory>
@@ -57,12 +56,19 @@
             <ComponentRef Id='MainExecutable' />
         </Feature>
 
+
+    <CustomAction Id='SetEnvironment' Directory='TARGETDIR' ExeCommand='cmd.exe /c setx PATH [INSTALLDIR]' Return='check' />
+
+
         <!-- Include the WixUIExtension for standard dialogs --> 
         <UIRef Id="WixUI_InstallDir" /> 
         <!-- Add a custom action to show a thank you message --> 
         <CustomAction Id="ShowThankYou" Return="ignore" Execute="immediate" Script="vbscript"> <![CDATA[ MsgBox "Thank you for installing OneUptimevInfrastructure Agent!", vbInformation, "Installation Complete" ]]> </CustomAction> 
         <!-- Schedule the custom action to run at the end of the installation --> 
-        <InstallExecuteSequence> <Custom Action="ShowThankYou" After="InstallFinalize">NOT Installed</Custom> </InstallExecuteSequence>
+        <InstallExecuteSequence> 
+        <Custom Action="SetEnvironment" After="InstallFiles">NOT Installed</Custom>
+        <Custom Action="ShowThankYou" After="InstallFinalize">NOT Installed</Custom> 
+        </InstallExecuteSequence>
 
     </Product>
 </Wix>
\ No newline at end of file
diff --git a/InfrastructureAgent/windows/app-arm64-template.wxs b/InfrastructureAgent/windows/app-arm64-template.wxs
index f5d32b11f8..1f6cc1f4df 100644
--- a/InfrastructureAgent/windows/app-arm64-template.wxs
+++ b/InfrastructureAgent/windows/app-arm64-template.wxs
@@ -47,7 +47,7 @@
                             Source='binary_placeholder'
                             KeyPath='yes'
                         />
-                        <Environment Id='PATH' Name='PATH' Value='[INSTALLDIR]' Permanent='no' Part='last' Action='set' />
+
                     </Component>
                 </Directory>
             </Directory>
@@ -57,12 +57,19 @@
             <ComponentRef Id='MainExecutable' />
         </Feature>
 
+
+    <CustomAction Id='SetEnvironment' Directory='TARGETDIR' ExeCommand='cmd.exe /c setx PATH [INSTALLDIR]' Return='check' />
+
+
         <!-- Include the WixUIExtension for standard dialogs --> 
         <UIRef Id="WixUI_InstallDir" /> 
         <!-- Add a custom action to show a thank you message --> 
         <CustomAction Id="ShowThankYou" Return="ignore" Execute="immediate" Script="vbscript"> <![CDATA[ MsgBox "Thank you for installing OneUptimevInfrastructure Agent!", vbInformation, "Installation Complete" ]]> </CustomAction> 
         <!-- Schedule the custom action to run at the end of the installation --> 
-        <InstallExecuteSequence> <Custom Action="ShowThankYou" After="InstallFinalize">NOT Installed</Custom> </InstallExecuteSequence>
+        <InstallExecuteSequence> 
+        <Custom Action="SetEnvironment" After="InstallFiles">NOT Installed</Custom>
+        <Custom Action="ShowThankYou" After="InstallFinalize">NOT Installed</Custom> 
+        </InstallExecuteSequence>
         
     </Product>
 </Wix>
\ No newline at end of file