diff --git a/README.md b/README.md
index 245ff9c..d24e0a3 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,9 @@ goreleaser --snapshot
 ```
 
 ## Build MSI package
-– Should be done on Windows machine
-– Open command prompt(cmd.exe)
-– Go to cagent directory `cd path_to_directory`
-– Run `goreleaser --snapshot` to build binaries
-– Run `build-win.bat`
\ No newline at end of file
+Should be done on Windows machine
+- [Download go-msi](https://github.com/cloudradar-monitoring/go-msi/releases) and put it in the `C:\Program Files\go-msi`
+- Open command prompt(cmd.exe or powershell)
+- Go to cagent directory `cd path_to_directory`
+- Run `goreleaser --snapshot` to build binaries
+- Run `build-win.bat`
\ No newline at end of file
diff --git a/pkg-scripts/msi-templates/FolderUninstall.wxs b/pkg-scripts/msi-templates/FolderUninstall.wxs
new file mode 100644
index 0000000..b036b3b
--- /dev/null
+++ b/pkg-scripts/msi-templates/FolderUninstall.wxs
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+ <Fragment Id="FolderUninstall">
+     <?define RegDir="SYSTEM\ControlSet001\services\[Manufacturer]:[ProductName]"?>
+     <?define RegValueName="InstallDir"?>
+     <Property Id="INSTALLFOLDER">
+         <RegistrySearch Root="HKLM" Key="$(var.RegDir)" Type="raw"
+                   Id="APPLICATIONFOLDER_REGSEARCH" Name="$(var.RegValueName)" />
+     </Property>
+
+     <DirectoryRef Id='INSTALLDIR'>
+         <Component Id="UninstallFolder" Guid="*">
+             <CreateFolder Directory="INSTALLDIR"/>
+             <util:RemoveFolderEx Property="INSTALLDIR" On="uninstall"/>
+             <RemoveFolder Id="INSTALLDIR" On="uninstall"/>
+             <RegistryValue Root="HKLM" Key="$(var.RegDir)" Name="$(var.RegValueName)"
+                     Type="string" Value="[INSTALLDIR]" KeyPath="yes"/>
+         </Component>
+     </DirectoryRef>
+ </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/pkg-scripts/msi-templates/WixUI_HK.wxs b/pkg-scripts/msi-templates/WixUI_HK.wxs
index 7e264ec..08c5aeb 100644
--- a/pkg-scripts/msi-templates/WixUI_HK.wxs
+++ b/pkg-scripts/msi-templates/WixUI_HK.wxs
@@ -46,15 +46,19 @@
          <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
          <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
          <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-         <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ConfigDlg_HK" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+     
 
+	     <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Order="4" Value="VerifyReadyDlg">OLDERVERSIONBEINGUPGRADED AND WIXUI_INSTALLDIR_VALID="1"</Publish>
+	     <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Order="5" Value="ConfigDlg_HK">NOT OLDERVERSIONBEINGUPGRADED AND WIXUI_INSTALLDIR_VALID="1"</Publish>
          <Publish Dialog="ConfigDlg_HK" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
          <Publish Dialog="ConfigDlg_HK" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
 
          <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
          <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
 
-         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
+	     <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Order="1" Value="InstallDirDlg">OLDERVERSIONBEINGUPGRADED AND WIXUI_INSTALLDIR_VALID="1"</Publish>
+	     <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Order="2" Value="ConfigDlg_HK">NOT OLDERVERSIONBEINGUPGRADED AND WIXUI_INSTALLDIR_VALID="1"</Publish>
+         
 
          <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
 
diff --git a/pkg-scripts/msi-templates/choco/LICENSE.txt b/pkg-scripts/msi-templates/choco/LICENSE.txt
deleted file mode 100644
index e0cd646..0000000
--- a/pkg-scripts/msi-templates/choco/LICENSE.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-From: {{.Choco.LicenseURL}}
-
-LICENSE
-
-{{if gt (.License | len) 0}}
-{{.License | cat}}
-{{else if gt (.Choco.LicenseURL | len) 0}}
-{{.Choco.LicenseURL | download}}
-{{end}}
diff --git a/pkg-scripts/msi-templates/choco/VERIFICATION.txt b/pkg-scripts/msi-templates/choco/VERIFICATION.txt
deleted file mode 100644
index 1610954..0000000
--- a/pkg-scripts/msi-templates/choco/VERIFICATION.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-VERIFICATION
-
-To check the checksum of this package, extract the msi file contained into it,
-then run
-
-  checksum.exe {{.Choco.MsiFile}} -t=sha256
-
-The result must match
-
-  {{.Choco.MsiSum | upper}}
diff --git a/pkg-scripts/msi-templates/choco/chocolateyInstall.ps1 b/pkg-scripts/msi-templates/choco/chocolateyInstall.ps1
deleted file mode 100644
index f3cb7ae..0000000
--- a/pkg-scripts/msi-templates/choco/chocolateyInstall.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$packageName = '{{.Choco.ID}}'
-$fileType = 'msi'
-$silentArgs = '/quiet';
-$scriptPath =  $(Split-Path $MyInvocation.MyCommand.Path);
-$fileFullPath = Join-Path $scriptPath '{{.Choco.MsiFile}}';
-
-Install-ChocolateyInstallPackage $packageName $fileType $silentArgs $fileFullPath -checksum '{{.Choco.MsiSum}}' -checksumType = 'sha256'
diff --git a/pkg-scripts/msi-templates/choco/chocolateyUninstall.ps1 b/pkg-scripts/msi-templates/choco/chocolateyUninstall.ps1
deleted file mode 100644
index 367c85b..0000000
--- a/pkg-scripts/msi-templates/choco/chocolateyUninstall.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$packageName = "{{.Choco.ID}}";
-$fileType = 'msi';
-$scriptPath =  $(Split-Path $MyInvocation.MyCommand.Path);
-$fileFullPath = Join-Path $scriptPath '{{.Choco.MsiFile}}';
-
-Uninstall-ChocolateyPackage $packageName $fileType "$fileFullPath /q"
diff --git a/pkg-scripts/msi-templates/choco/pkg.nuspec b/pkg-scripts/msi-templates/choco/pkg.nuspec
deleted file mode 100644
index c2e7d5b..0000000
--- a/pkg-scripts/msi-templates/choco/pkg.nuspec
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <metadata>
-    <id>{{.Choco.ID}}</id>
-    <title>{{.Choco.Title}}</title>
-    <version>{{.VersionOk}}</version>
-    <authors>{{.Choco.Authors}}</authors>
-    <owners>{{.Choco.Owners}}</owners>
-    <description>{{.Choco.Description}}</description>
-    {{if gt (.Choco.ProjectURL | len) 0}}
-    <projectUrl>{{.Choco.ProjectURL}}</projectUrl>
-    {{end}}
-    {{if gt (.Choco.Tags | len) 0}}
-    <tags>{{.Choco.Tags}}</tags>
-    {{end}}
-    {{if gt (.Choco.LicenseURL | len) 0}}
-    <licenseUrl>{{.Choco.LicenseURL}}</licenseUrl>
-    {{end}}
-    {{if gt (.Choco.IconURL | len) 0}}
-    <iconUrl>{{.Choco.IconURL}}</iconUrl>
-    {{end}}
-    {{if gt (.Choco.ChangeLog | len) 0}}
-    <releaseNotes>{{.Choco.ChangeLog}}</releaseNotes>
-    {{end}}
-    {{if .Choco.RequireLicense}}
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    {{else}}
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    {{end}}
-  </metadata>
-  <files>
-    <file src="{{.Choco.BuildDir}}\chocolateyInstall.ps1" target="tools" />
-    <file src="{{.Choco.BuildDir}}\chocolateyUninstall.ps1" target="tools" />
-    <file src="{{.Choco.BuildDir}}\{{.Choco.MsiFile}}" target="tools" />
-    <file src="{{.Choco.BuildDir}}\LICENSE.txt" target="tools" />
-    <file src="{{.Choco.BuildDir}}\VERIFICATION.txt" target="tools" />
-  </files>
-</package>
diff --git a/pkg-scripts/msi-templates/product.wxs b/pkg-scripts/msi-templates/product.wxs
index 1bd3bee..348a2b0 100644
--- a/pkg-scripts/msi-templates/product.wxs
+++ b/pkg-scripts/msi-templates/product.wxs
@@ -16,7 +16,7 @@
             Manufacturer="{{.Company}}"
             Language="1033">
 
-      <Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package" InstallScope="perMachine"/>
+      <Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package"/>
 
       <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
 
@@ -34,18 +34,21 @@
                {{if gt (.Files.Items | len) 0}}
                <Component Id="ApplicationFiles" Guid="{{.Files.GUID}}">
                   {{range $i, $e := .Files.Items}}
-                    <File Id="ApplicationFile{{$i}}" Source="{{$e}}"/>
                      {{if eq $i 0}}
-                         <ServiceInstall Id="ServiceInstaller" Name="Cagent" Type="ownProcess" Vital="yes" DisplayName="Cagent" Description="Cagent" Start="auto" Account="LocalSystem" ErrorControl="normal" Arguments=" /start cagent" Interactive="no" />
-                         <ServiceControl Id="StartService" Name="Cagent" Stop="both" Start="install" Remove="uninstall" Wait="yes" />
-                    {{end}}
-                  {{end}}
+                         <ServiceInstall Id="ServiceInstaller" Name="Cagent" Type="ownProcess" Vital="yes" DisplayName="Cagent" Description="Cagent" Start="auto" Account="LocalSystem" ErrorControl="normal" Interactive="no">
+                         </ServiceInstall>
+                         <ServiceControl Id="StartService" Name="Cagent" Stop="both" Start="install" Remove="uninstall" Wait="yes">
+                               <ServiceArgument />
+                         </ServiceControl>
+                     {{end}}
+               	     <File Id="ApplicationFile{{$i}}" Source="{{$e}}"/>
+		         {{end}}
                </Component>
                {{end}}
                {{if gt (.Directories | len) 0}}
-               {{range $i, $e := .Directories}}
-               <Directory Id="APPDIR{{$i}}" Name="{{$e}}" />
-               {{end}}
+                  {{range $i, $e := .Directories}}
+                     <Directory Id="APPDIR{{$i}}" Name="{{$e}}" />
+                 {{end}}
                {{end}}
             </Directory>
          </Directory>
@@ -137,6 +140,9 @@
          {{range $i, $e := .Directories}}
          <ComponentGroupRef Id="AppFiles{{$i}}" />
          {{end}}
+         <Feature Id="Uninstall">
+             <ComponentRef Id="UninstallFolder" Primary="yes"/>
+         </Feature>
       </Feature>
 
       <UI>