diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..73a38dc406
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,52 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [7.36.1](https://github.com/openvoxproject/puppet/tree/7.36.1) (2025-05-31)
+
+[Full Changelog](https://github.com/openvoxproject/puppet/compare/7.36.1...7.36.1)
+
+**Implemented enhancements:**
+
+- \[Feature request\]: Fix file descriptor management in safe\_posix\_fork [\#41](https://github.com/OpenVoxProject/puppet/issues/41)
+- Add `implementation` fact to agent and server. [\#63](https://github.com/OpenVoxProject/puppet/pull/63) ([ffrank](https://github.com/ffrank))
+
+**Fixed bugs:**
+
+- \[Bug\]: puppet agent not working with dnf5 [\#19](https://github.com/OpenVoxProject/puppet/issues/19)
+- Replace `erase` with `remove`, since it's no longer supported with DNF5 [\#68](https://github.com/OpenVoxProject/puppet/pull/68) ([Stricken1670](https://github.com/Stricken1670))
+- Remove require for module\_tool/contents\_description [\#62](https://github.com/OpenVoxProject/puppet/pull/62) ([ekohl](https://github.com/ekohl))
+
+**Closed issues:**
+
+- Bad link for Github Issues [\#26](https://github.com/OpenVoxProject/puppet/issues/26)
+
+**Merged pull requests:**
+
+- dependabot: check for github actions and bundler [\#46](https://github.com/OpenVoxProject/puppet/pull/46) ([bastelfreak](https://github.com/bastelfreak))
+- Reenable and cleanup CI configuration [\#45](https://github.com/OpenVoxProject/puppet/pull/45) ([bastelfreak](https://github.com/bastelfreak))
+- Remove unused ContentsDescription class [\#44](https://github.com/OpenVoxProject/puppet/pull/44) ([ekohl](https://github.com/ekohl))
+- Fix a typo and some formatting in the type and provider docs [\#43](https://github.com/OpenVoxProject/puppet/pull/43) ([smoeding](https://github.com/smoeding))
+- Avoid closing directory we're iterating [\#42](https://github.com/OpenVoxProject/puppet/pull/42) ([ekohl](https://github.com/ekohl))
+- Set version to 8.16.0 [\#40](https://github.com/OpenVoxProject/puppet/pull/40) ([nmburgan](https://github.com/nmburgan))
+- Update util.rb to fix closing of file. [\#39](https://github.com/OpenVoxProject/puppet/pull/39) ([adamboutcher](https://github.com/adamboutcher))
+- Fix unit test CSR versions for OpenSSL 3.4 change [\#37](https://github.com/OpenVoxProject/puppet/pull/37) ([seanmil](https://github.com/seanmil))
+- Fix unit tests for yum/dnf provider option change [\#36](https://github.com/OpenVoxProject/puppet/pull/36) ([seanmil](https://github.com/seanmil))
+- Fix unit tests missed during the de-brandification [\#35](https://github.com/OpenVoxProject/puppet/pull/35) ([seanmil](https://github.com/seanmil))
+- Set version to 8.15.0 [\#34](https://github.com/OpenVoxProject/puppet/pull/34) ([nmburgan](https://github.com/nmburgan))
+- Standardize rake tasks [\#31](https://github.com/OpenVoxProject/puppet/pull/31) ([nmburgan](https://github.com/nmburgan))
+- 8.14.0 [\#30](https://github.com/OpenVoxProject/puppet/pull/30) ([nmburgan](https://github.com/nmburgan))
+- Update issues link in README to a full URL. [\#27](https://github.com/OpenVoxProject/puppet/pull/27) ([jstraw](https://github.com/jstraw))
+- Add fix for package running dnf5 on fedora [\#20](https://github.com/OpenVoxProject/puppet/pull/20) ([silug](https://github.com/silug))
+- 8.13.0 [\#17](https://github.com/OpenVoxProject/puppet/pull/17) ([nmburgan](https://github.com/nmburgan))
+- Update version to 8.12.1 [\#15](https://github.com/OpenVoxProject/puppet/pull/15) ([nmburgan](https://github.com/nmburgan))
+- Make compressed man pages reproducible [\#10](https://github.com/OpenVoxProject/puppet/pull/10) ([smortex](https://github.com/smortex))
+- update generated man pages for the debrand [\#9](https://github.com/OpenVoxProject/puppet/pull/9) ([binford2k](https://github.com/binford2k))
+- adding new Gemfile entrties into the puppet.gemspec file as runtime d… [\#7](https://github.com/OpenVoxProject/puppet/pull/7) ([cvquesty](https://github.com/cvquesty))
+- adding ostruct and benchmark at their penultimate versions due to war… [\#6](https://github.com/OpenVoxProject/puppet/pull/6) ([cvquesty](https://github.com/cvquesty))
+- First pass at debranding [\#4](https://github.com/OpenVoxProject/puppet/pull/4) ([binford2k](https://github.com/binford2k))
+- removes a gem that hasn't been updated in 15 years [\#3](https://github.com/OpenVoxProject/puppet/pull/3) ([binford2k](https://github.com/binford2k))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/Gemfile b/Gemfile
index 41aef8879e..b6817218c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,6 +66,8 @@ group(:development, optional: true) do
 end
 
 group(:packaging) do
+  gem 'github_changelog_generator'
+  gem 'faraday-retry'
   gem 'packaging', *location_for(ENV['PACKAGING_LOCATION'] || '~> 0.99')
 end
 
diff --git a/Rakefile b/Rakefile
index 94226f5169..05a1645313 100644
--- a/Rakefile
+++ b/Rakefile
@@ -131,3 +131,26 @@ if Rake.application.top_level_tasks.grep(/^gettext:/).any?
     abort("Run `bundle install --with documentation` to install the `gettext-setup` gem.")
   end
 end
+
+begin
+  require "github_changelog_generator/task"
+  require_relative "lib/puppet/version"
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.header = <<~HEADER.chomp
+    # Changelog
+
+    All notable changes to this project will be documented in this file.
+    HEADER
+    config.user = "openvoxproject"
+    config.project = "puppet"
+    config.exclude_labels = %w[dependencies duplicate question invalid wontfix wont-fix modulesync skip-changelog]
+    config.future_release = Puppet::PUPPETVERSION
+    config.since_tag = '7.36.1'
+    config.exclude_tags_regex = '^8'
+  end
+rescue LoadError
+  task :changelog do
+    abort("Run `bundle install --with packaging` to install the `github_changelog_generator` gem.")
+  end
+end
diff --git a/puppet.gemspec b/puppet.gemspec
index 41d1160f57..743e9f65f5 100644
--- a/puppet.gemspec
+++ b/puppet.gemspec
@@ -1,6 +1,8 @@
+require_relative 'lib/puppet/version'
+
 Gem::Specification.new do |spec|
   spec.name = "openvox"
-  spec.version = "7.36.1"
+  spec.version = Puppet::PUPPETVERSION
   spec.license = 'Apache-2.0'
 
   spec.required_rubygems_version = Gem::Requirement.new("> 1.3.1")