diff --git a/automatic/elasticsearch/elasticsearch.json b/automatic/elasticsearch/elasticsearch.json
index 1756f3ad2..df2a8da47 100644
--- a/automatic/elasticsearch/elasticsearch.json
+++ b/automatic/elasticsearch/elasticsearch.json
@@ -3,5 +3,6 @@
     "7.17":  "7.17.7",
     "8.0-rc":  "8.0.0-rc2",
     "8.4":  "8.4.3",
-    "8.5":  "8.5.3"
+    "8.5":  "8.5.3",
+    "8.6":  "8.6.0"
 }
diff --git a/automatic/elasticsearch/elasticsearch.nuspec b/automatic/elasticsearch/elasticsearch.nuspec
index 7a326c8f9..70da14166 100644
--- a/automatic/elasticsearch/elasticsearch.nuspec
+++ b/automatic/elasticsearch/elasticsearch.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- version should MATCH as closely as possible with the underlying software -->
     <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
     <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>8.5.3</version>
+    <version>8.6.0</version>
     <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
     <owners>Maurice Kevenaar</owners>
     <!-- ============================== -->
@@ -41,7 +41,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- copyright is usually years and software vendor, but not required for internal feeds -->
     <copyright>Elasticsearch B.V.</copyright>
     <tags>search REST analytics metrics</tags>
-    <releaseNotes>https://www.elastic.co/guide/en/elasticsearch/reference/8.5/release-notes-8.5.3.html</releaseNotes>
+    <releaseNotes>https://www.elastic.co/guide/en/elasticsearch/reference/8.6/release-notes-8.6.0.html</releaseNotes>
     <licenseUrl>https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <packageSourceUrl>https://github.com/mkevenaar/chocolatey-packages/tree/master/automatic/elasticsearch</packageSourceUrl>
diff --git a/automatic/elasticsearch/tools/chocolateyBeforeModify.ps1 b/automatic/elasticsearch/tools/chocolateyBeforeModify.ps1
index 9d33378c5..e0175fbd9 100644
--- a/automatic/elasticsearch/tools/chocolateyBeforeModify.ps1
+++ b/automatic/elasticsearch/tools/chocolateyBeforeModify.ps1
@@ -5,6 +5,6 @@ $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 $unPath = Join-Path $toolsDir 'Uninstall-ChocolateyPath.psm1'
 Import-Module $unPath
 
-$version      = "8.5.3"
+$version      = "8.6.0"
 $binPath = Join-Path $toolsDir "elasticsearch-$($version)\bin"
 Uninstall-ChocolateyPath $binPath 'Machine'
diff --git a/automatic/elasticsearch/tools/chocolateyInstall.ps1 b/automatic/elasticsearch/tools/chocolateyInstall.ps1
index deae7005e..1aa83f582 100644
--- a/automatic/elasticsearch/tools/chocolateyInstall.ps1
+++ b/automatic/elasticsearch/tools/chocolateyInstall.ps1
@@ -1,10 +1,10 @@
 $ErrorActionPreference = 'Stop';
 
 $toolsDir     = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$url          = 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.5.3-windows-x86_64.zip'
-$checksum     = 'ea8faf7fc7c00b9c9fe6834c1a9bd635dd7377327f85adef877cee261f79d778'
+$url          = 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.0-windows-x86_64.zip'
+$checksum     = '8c3ef6b8efa9b83565ea901d7cc7cae0343991fcd0a906a5a5b6d4e9840ff8e0'
 $checksumType = 'sha256'
-$version      = "8.5.3"
+$version      = "8.6.0"
 
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
diff --git a/automatic/kibana/kibana.json b/automatic/kibana/kibana.json
index fed1719bc..4899bdd66 100644
--- a/automatic/kibana/kibana.json
+++ b/automatic/kibana/kibana.json
@@ -3,5 +3,6 @@
     "7.17":  "7.17.8",
     "8.0-rc":  "8.0.0-rc2",
     "8.4":  "8.4.3",
-    "8.5":  "8.5.3"
+    "8.5":  "8.5.3",
+    "8.6":  "8.6.0"
 }
diff --git a/automatic/kibana/kibana.nuspec b/automatic/kibana/kibana.nuspec
index 5753b6bfd..00a2d3e12 100644
--- a/automatic/kibana/kibana.nuspec
+++ b/automatic/kibana/kibana.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- version should MATCH as closely as possible with the underlying software -->
     <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
     <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>8.5.3</version>
+    <version>8.6.0</version>
     <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
     <owners>Maurice Kevenaar</owners>
     <!-- ============================== -->
@@ -41,7 +41,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- copyright is usually years and software vendor, but not required for internal feeds -->
     <copyright>Elasticsearch B.V.</copyright>
     <tags>data kibana visualization elastic admin</tags>
-    <releaseNotes>https://www.elastic.co/guide/en/kibana/reference/8.5/release-notes-8.5.3.html</releaseNotes>
+    <releaseNotes>https://www.elastic.co/guide/en/kibana/reference/8.6/release-notes-8.6.0.html</releaseNotes>
     <licenseUrl>https://github.com/elastic/kibana/blob/master/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <packageSourceUrl>https://github.com/mkevenaar/chocolatey-packages/tree/master/automatic/kibana</packageSourceUrl>
diff --git a/automatic/kibana/tools/chocolateyBeforeModify.ps1 b/automatic/kibana/tools/chocolateyBeforeModify.ps1
index 36a38cd21..a97526b72 100644
--- a/automatic/kibana/tools/chocolateyBeforeModify.ps1
+++ b/automatic/kibana/tools/chocolateyBeforeModify.ps1
@@ -12,6 +12,6 @@ $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 $unPath = Join-Path $toolsDir 'Uninstall-ChocolateyPath.psm1'
 Import-Module $unPath
 
-$version      = "8.5.3"
+$version      = "8.6.0"
 $binPath = Join-Path $toolsDir "kibana-$($version)-windows-x86_64\bin"
 Uninstall-ChocolateyPath $binPath 'Machine'
diff --git a/automatic/kibana/tools/chocolateyInstall.ps1 b/automatic/kibana/tools/chocolateyInstall.ps1
index 7854ae1d1..8489fc9cc 100644
--- a/automatic/kibana/tools/chocolateyInstall.ps1
+++ b/automatic/kibana/tools/chocolateyInstall.ps1
@@ -1,10 +1,10 @@
 $ErrorActionPreference = 'Stop';
 
 $toolsDir     = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$url          = 'https://artifacts.elastic.co/downloads/kibana/kibana-8.5.3-windows-x86_64.zip'
-$checksum     = 'b92ff8ab8e8485b9dafb5383fb9459bd9377c60df541a6444da16fa07bd6526f'
+$url          = 'https://artifacts.elastic.co/downloads/kibana/kibana-8.6.0-windows-x86_64.zip'
+$checksum     = '508cf815b34c19e0cb0b01db971517b19bc0adb11c78397e90d49bcf0c6481f0'
 $checksumType = 'sha256'
-$version      = "8.5.3"
+$version      = "8.6.0"
 
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName