diff --git a/fusioninventory-agent.install/fusioninventory-agent.install.nuspec b/fusioninventory-agent.install/fusioninventory-agent.install.nuspec
index 7087b47..3b4f599 100644
--- a/fusioninventory-agent.install/fusioninventory-agent.install.nuspec
+++ b/fusioninventory-agent.install/fusioninventory-agent.install.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>fusioninventory-agent.install</id>
     <title>FusionInventory Agent (Install)</title>
-    <version>2.3.17</version>
+    <version>2.3.18</version>
     <authors>FusionInventory Project</authors>
     <owners>DUVERGIER Claude</owners>
     <summary>Agent for FusionInventory: performs a large array of management tasks, such as local inventory, software deployment or network discovery. It can be used either standalone, or in combination with a compatible server (OCS Inventory, GLPI, OTRS, Uranos, ...) acting as a centralized control point.</summary>
diff --git a/fusioninventory-agent.install/tools/chocolateyInstall.ps1 b/fusioninventory-agent.install/tools/chocolateyInstall.ps1
index b75a4ae..1f36d89 100644
--- a/fusioninventory-agent.install/tools/chocolateyInstall.ps1
+++ b/fusioninventory-agent.install/tools/chocolateyInstall.ps1
@@ -1,8 +1,14 @@
-$packageName = 'fusioninventory-agent.install'
-$installerType = 'exe'
-$url = 'http://forge.fusioninventory.org/attachments/download/1892/fusioninventory-agent_windows-x86_2.3.17.exe'
-$url64 = 'http://forge.fusioninventory.org/attachments/download/1889/fusioninventory-agent_windows-x64_2.3.17.exe'
-$silentArgs = '/S /acceptlicense'
-$validExitCodes = @(0)
+$packageInstallArgs = @{
+    packageName    = 'fusioninventory-agent.install'
+    fileType       = 'exe'
+    url            = 'https://github.com/tabad/fusioninventory-agent-windows-installer/releases/download/2.3.18/fusioninventory-agent_windows-x86_2.3.18.exe'
+    url64bit       = 'https://github.com/tabad/fusioninventory-agent-windows-installer/releases/download/2.3.18/fusioninventory-agent_windows-x64_2.3.18.exe'
+    silentArgs     = '/S /acceptlicense'
+    validExitCodes = @(0)
+    checksum       = '5610705b44d14cb14f8d815a39526dc702eae359f6d64e560b8730bfd230164d'
+    checksumType   = 'sha256'
+    checksum64     = 'c901531de9c35e6af38b298a00bbc04acf258ebfcdd61a482d7a2a5d19566015'
+    checksumType64 = 'sha256'
+}
 
-Install-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" "$url64"  -validExitCodes $validExitCodes
\ No newline at end of file
+Install-ChocolateyPackage @packageInstallArgs
\ No newline at end of file
diff --git a/fusioninventory-agent.portable/fusioninventory-agent.portable.nuspec b/fusioninventory-agent.portable/fusioninventory-agent.portable.nuspec
index 2735980..b444f2b 100644
--- a/fusioninventory-agent.portable/fusioninventory-agent.portable.nuspec
+++ b/fusioninventory-agent.portable/fusioninventory-agent.portable.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>fusioninventory-agent.portable</id>
     <title>FusionInventory Agent (Portable)</title>
-    <version>2.3.17</version>
+    <version>2.3.18</version>
     <authors>FusionInventory Project</authors>
     <owners>DUVERGIER Claude</owners>
     <summary>Agent for FusionInventory: performs a large array of management tasks, such as local inventory, software deployment or network discovery. It can be used either standalone, or in combination with a compatible server (OCS Inventory, GLPI, OTRS, Uranos, ...) acting as a centralized control point.</summary>
diff --git a/fusioninventory-agent.portable/tools/chocolateyInstall.ps1 b/fusioninventory-agent.portable/tools/chocolateyInstall.ps1
index f2c72e4..12e52ef 100644
--- a/fusioninventory-agent.portable/tools/chocolateyInstall.ps1
+++ b/fusioninventory-agent.portable/tools/chocolateyInstall.ps1
@@ -1,6 +1,14 @@
 $packageName = 'fusioninventory-agent.portable'
-$url = 'http://forge.fusioninventory.org/attachments/download/1891/fusioninventory-agent_windows-x86_2.3.17-portable.exe' # NB: Theses EXE are 7z SFX
-$url64 = 'http://forge.fusioninventory.org/attachments/download/1890/fusioninventory-agent_windows-x64_2.3.17-portable.exe'
+
+$packageDownloadArgs = @{
+    packageName = $packageName
+    url         = 'https://github.com/tabad/fusioninventory-agent-windows-installer/releases/download/2.3.18/fusioninventory-agent_windows-x86_2.3.18-portable.exe' # NB: Theses EXE are 7z SFX
+    url64bit    = 'https://github.com/tabad/fusioninventory-agent-windows-installer/releases/download/2.3.18/fusioninventory-agent_windows-x64_2.3.18-portable.exe'
+    checksum       = 'fa472f4831f28842e7130bd751d7d1f63242e71428021a908d46f7255c1c97c5'
+    checksumType   = 'sha256'
+    checksum64     = '07b09f73f06e520b09b5ca91cac291e915bb174f11b3bad420c8de9364d058b2'
+    checksumType64 = 'sha256'
+}
 
 try { 
   $installDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
@@ -11,7 +19,8 @@ try {
   if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir)}
 
   $file = Join-Path $tempDir "$($packageName).exe" # Using ".exe" here to match extension of file located at $url/$url64
-  Get-ChocolateyWebFile "$packageName" "$file" "$url" "$url64"
+  $packageDownloadArgs.Add('FileFullPath', $file)
+  Get-ChocolateyWebFile @packageDownloadArgs
 
   Start-Process `"$file`" -ArgumentList "-o`"$installDir`" -y" -Wait # Downloaded file is a 7z SFX: just execute it
 
diff --git a/fusioninventory-agent/fusioninventory-agent.nuspec b/fusioninventory-agent/fusioninventory-agent.nuspec
index 3c8e2ae..6cd69ae 100644
--- a/fusioninventory-agent/fusioninventory-agent.nuspec
+++ b/fusioninventory-agent/fusioninventory-agent.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>fusioninventory-agent</id>
     <title>FusionInventory Agent</title>
-    <version>2.3.17</version>
+    <version>2.3.18</version>
     <authors>FusionInventory Project</authors>
     <owners>DUVERGIER Claude</owners>
     <summary>Agent for FusionInventory: performs a large array of management tasks, such as local inventory, software deployment or network discovery. It can be used either standalone, or in combination with a compatible server (OCS Inventory, GLPI, OTRS, Uranos, ...) acting as a centralized control point.</summary>
@@ -15,7 +15,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>https://raw.github.com/C-Duv/chocolatey-fusioninventory-agent/master/fusioninventory-agent/fusioninventory-agent-logo.png</iconUrl>
     <dependencies>
-      <dependency id="fusioninventory-agent.install" version="[2.3.17]" />
+      <dependency id="fusioninventory-agent.install" version="[2.3.18]" />
     </dependencies>
     <releaseNotes></releaseNotes>
     <projectSourceUrl>https://github.com/fusioninventory/fusioninventory-agent</projectSourceUrl>