diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6db848e5..b91bcce3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 5.18.3 -->
-## [v5.18.3](https://github.com/inspec/inspec/tree/v5.18.3) (2022-06-10)
+<!-- latest_release 5.18.4 -->
+## [v5.18.4](https://github.com/inspec/inspec/tree/v5.18.4) (2022-06-13)
 
 #### Merged Pull Requests
-- Dk/matchers rewrite [#6007](https://github.com/inspec/inspec/pull/6007) ([dkumaras](https://github.com/dkumaras))
+- Add inspec-6 branch as release branch [#6136](https://github.com/inspec/inspec/pull/6136) ([clintoncwolfe](https://github.com/clintoncwolfe))
 <!-- latest_release -->
 
 <!-- release_rollup since=5.17.4 -->
 ### Changes since 5.17.4 release
 
 #### Merged Pull Requests
+- Add inspec-6 branch as release branch [#6136](https://github.com/inspec/inspec/pull/6136) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 5.18.4 -->
 - Dk/matchers rewrite [#6007](https://github.com/inspec/inspec/pull/6007) ([dkumaras](https://github.com/dkumaras)) <!-- 5.18.3 -->
 - Fixed Lint/DuplicateMethods: Method Inspec::Resources::Service#resource_id is defined at both [#6132](https://github.com/inspec/inspec/pull/6132) ([Vasu1105](https://github.com/Vasu1105)) <!-- 5.18.2 -->
 - CFINSPEC-291: Fix `processes` resource to consider processes without `path` on Windows [#6100](https://github.com/inspec/inspec/pull/6100) ([ahasunos](https://github.com/ahasunos)) <!-- 5.18.1 -->
diff --git a/VERSION b/VERSION
index 94bdd01c8..ece890387 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.18.3
\ No newline at end of file
+5.18.4
\ No newline at end of file
diff --git a/inspec-bin/lib/inspec-bin/version.rb b/inspec-bin/lib/inspec-bin/version.rb
index 9db8afb4c..3157cf430 100644
--- a/inspec-bin/lib/inspec-bin/version.rb
+++ b/inspec-bin/lib/inspec-bin/version.rb
@@ -1,5 +1,5 @@
 # This file managed by automation - do not edit manually
 module InspecBin
   INSPECBIN_ROOT = File.expand_path("..", __dir__)
-  VERSION = "5.18.3".freeze
+  VERSION = "5.18.4".freeze
 end
diff --git a/lib/inspec/version.rb b/lib/inspec/version.rb
index cebb2b952..6f8449a20 100644
--- a/lib/inspec/version.rb
+++ b/lib/inspec/version.rb
@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "5.18.3".freeze
+  VERSION = "5.18.4".freeze
 end