diff --git a/automatic/elasticsearch/elasticsearch.json b/automatic/elasticsearch/elasticsearch.json
index b3f7ebbb0..658eb1e5e 100644
--- a/automatic/elasticsearch/elasticsearch.json
+++ b/automatic/elasticsearch/elasticsearch.json
@@ -1,6 +1,6 @@
 {
     "6.8":  "6.8.23.20220801",
-    "7.17":  "7.17.6",
+    "7.17":  "7.17.7",
     "8.0-rc":  "8.0.0-rc2",
     "8.4":  "8.4.3"
 }
diff --git a/automatic/elasticsearch/elasticsearch.nuspec b/automatic/elasticsearch/elasticsearch.nuspec
index 74a208379..c3235143d 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.4.3</version>
+    <version>7.17.7</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.4/release-notes-8.4.3.html</releaseNotes>
+    <releaseNotes>https://www.elastic.co/guide/en/elasticsearch/reference/7.17/release-notes-7.17.7.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 c24914af6..fa046d735 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.4.3"
+$version      = "7.17.7"
 $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 0584abd39..66823a405 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.4.3-windows-x86_64.zip'
-$checksum     = '44529ef70698647dac8ef5e48fcde179de6974482fd5eef1322b60a57a1f9960'
+$url          = 'https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.7-windows-x86_64.zip'
+$checksum     = '850e923482884a95b4d099cf0890e63f7f761e59952146684468ec6e7b504672'
 $checksumType = 'sha256'
-$version      = "8.4.3"
+$version      = "7.17.7"
 
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
diff --git a/automatic/kibana/kibana.json b/automatic/kibana/kibana.json
index d49917499..60c953189 100644
--- a/automatic/kibana/kibana.json
+++ b/automatic/kibana/kibana.json
@@ -1,6 +1,6 @@
 {
     "6.8":  "6.8.23",
-    "7.17":  "7.17.6",
+    "7.17":  "7.17.7",
     "8.0-rc":  "8.0.0-rc2",
     "8.4":  "8.4.3"
 }
diff --git a/automatic/kibana/kibana.nuspec b/automatic/kibana/kibana.nuspec
index 3a64d5df0..5bbb2d774 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.4.3</version>
+    <version>7.17.7</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.4/release-notes-8.4.3.html</releaseNotes>
+    <releaseNotes>https://www.elastic.co/guide/en/kibana/reference/7.17/release-notes-7.17.7.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 a7079014b..c7ba7c196 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.4.3"
+$version      = "7.17.7"
 $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 d69118c2a..16dc155aa 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.4.3-windows-x86_64.zip'
-$checksum     = '087c1120957bcc184f90233011d085df891cbca547a98200f098a1771c8beabf'
+$url          = 'https://artifacts.elastic.co/downloads/kibana/kibana-7.17.7-windows-x86_64.zip'
+$checksum     = '64430380525e5f62925d6041a4abb411ec19d6e5c8f12d13ac6a273cf47d1e8d'
 $checksumType = 'sha256'
-$version      = "8.4.3"
+$version      = "7.17.7"
 
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName