diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526d32e61bc..1c69fa3e5b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
 
-<!-- latest_release 18.4.35 -->
-## [v18.4.35](https://github.com/chef/chef/tree/v18.4.35) (2024-04-11)
+<!-- latest_release 18.4.36 -->
+## [v18.4.36](https://github.com/chef/chef/tree/v18.4.36) (2024-04-16)
 
 #### Merged Pull Requests
-- Add note about adding account rights not taking immediate effect. [#14325](https://github.com/chef/chef/pull/14325) ([tpowell-progress](https://github.com/tpowell-progress))
+- Revert &quot;Add missing `description` to windows_service load_current_resource for idempotent check to be successful&quot; [#14334](https://github.com/chef/chef/pull/14334) ([tpowell-progress](https://github.com/tpowell-progress))
 <!-- latest_release -->
 
 <!-- release_rollup since=18.4.12 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Revert &quot;Add missing `description` to windows_service load_current_resource for idempotent check to be successful&quot; [#14334](https://github.com/chef/chef/pull/14334) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 18.4.36 -->
 - Add note about adding account rights not taking immediate effect. [#14325](https://github.com/chef/chef/pull/14325) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 18.4.35 -->
 - [trivial] add missing markdown fence [#14326](https://github.com/chef/chef/pull/14326) ([dafyddcrosby](https://github.com/dafyddcrosby)) <!-- 18.4.34 -->
 - Choco version check fails for Licensed Clients [#14320](https://github.com/chef/chef/pull/14320) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.4.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cde92bb6f89..2682f4359df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,12 +44,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.4.35)
+    chef (18.4.36)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.4.35)
-      chef-utils (= 18.4.35)
+      chef-config (= 18.4.36)
+      chef-utils (= 18.4.36)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -78,13 +78,13 @@ PATH
       unf_ext (~> 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.4.35-x64-mingw-ucrt)
+    chef (18.4.36-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.4.35)
+      chef-config (= 18.4.36)
       chef-powershell (~> 18.1.0)
-      chef-utils (= 18.4.35)
+      chef-utils (= 18.4.36)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -128,15 +128,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.4.35)
-      chef (= 18.4.35)
+    chef-bin (18.4.36)
+      chef (= 18.4.36)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.4.35)
+    chef-config (18.4.36)
       addressable
-      chef-utils (= 18.4.35)
+      chef-utils (= 18.4.36)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -145,7 +145,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.4.35)
+    chef-utils (18.4.36)
       concurrent-ruby
 
 GEM
diff --git a/VERSION b/VERSION
index 6c21bc1115c..415e5dfd4f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.4.35
\ No newline at end of file
+18.4.36
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index a5136b5f06f..eb99db05675 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.4.35".freeze
+  VERSION = "18.4.36".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c04e4c14a2e..fcdfb30a31f 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.4.35".freeze
+  VERSION = "18.4.36".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 455a0b195aa..7e85df8a884 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.4.35"
+  VERSION = "18.4.36"
 end
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index 72a3009c99b..73eaae7c5d1 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    chef (18.4.35)
-    chef (18.4.35-x64-mingw-ucrt)
+    chef (18.4.36)
+    chef (18.4.36-x64-mingw-ucrt)
 
 PLATFORMS
   ruby
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index b753263086f..dfc8f729803 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.4.35".freeze
+    VERSION = "18.4.36".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b7ad3345371..b2fcb431907 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.4.35")
+  VERSION = Chef::VersionString.new("18.4.36")
 end
 
 #