diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5d5f803..0718e97e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## [12.0.0](https://github.com/theforeman/puppet-puppet/tree/12.0.0) (2019-04-17)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/11.0.1...12.0.0)
+
+**Breaking changes:**
+
+- Use current timeout management variables [\#693](https://github.com/theforeman/puppet-puppet/pull/693) ([ekohl](https://github.com/ekohl))
+- remove Debian 8 support [\#688](https://github.com/theforeman/puppet-puppet/pull/688) ([mmoll](https://github.com/mmoll))
+- drop Puppet 4 [\#685](https://github.com/theforeman/puppet-puppet/pull/685) ([mmoll](https://github.com/mmoll))
+- drop EOL OSes [\#684](https://github.com/theforeman/puppet-puppet/pull/684) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- Configurable minute and hour for cronjob and systemd.timer [\#690](https://github.com/theforeman/puppet-puppet/pull/690) ([mauricemeyer](https://github.com/mauricemeyer))
+- add Puppetserver 6.3 auth.conf update [\#689](https://github.com/theforeman/puppet-puppet/pull/689) ([mmoll](https://github.com/mmoll))
+- add 2018 to osreleasemajor for agent\_restart\_command  [\#686](https://github.com/theforeman/puppet-puppet/pull/686) ([cabrinha](https://github.com/cabrinha))
+- Handle the pluginsync setting deprecation [\#683](https://github.com/theforeman/puppet-puppet/pull/683) ([ekohl](https://github.com/ekohl))
+- Move client\_certname to \[main\] [\#681](https://github.com/theforeman/puppet-puppet/pull/681) ([baurmatt](https://github.com/baurmatt))
+- Implement $server\_max\_open\_files [\#671](https://github.com/theforeman/puppet-puppet/pull/671) ([baurmatt](https://github.com/baurmatt))
+
+## [11.0.1](https://github.com/theforeman/puppet-puppet/tree/11.0.1) (2019-04-02)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/11.0.0...11.0.1)
+
+**Fixed bugs:**
+
+- Fixes [\#26199](https://projects.theforeman.org/issues/26199) - Fix dependency cycle when using git\_repo [\#682](https://github.com/theforeman/puppet-puppet/pull/682) ([ekohl](https://github.com/ekohl))
+- Quick fix for Windows agent restart loop \#678 [\#679](https://github.com/theforeman/puppet-puppet/pull/679) ([anthonysomerset](https://github.com/anthonysomerset))
+
 ## [11.0.0](https://github.com/theforeman/puppet-puppet/tree/11.0.0) (2019-01-14)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/10.1.0...11.0.0)
@@ -11,6 +40,7 @@
 - Remove dynamic and config environments [\#653](https://github.com/theforeman/puppet-puppet/pull/653) ([ekohl](https://github.com/ekohl))
 - Remove passenger support [\#650](https://github.com/theforeman/puppet-puppet/pull/650) ([ekohl](https://github.com/ekohl))
 - Drop support for puppetserver \< 2.7 [\#649](https://github.com/theforeman/puppet-puppet/pull/649) ([ekohl](https://github.com/ekohl))
+- namespace extlib functions [\#639](https://github.com/theforeman/puppet-puppet/pull/639) ([mmoll](https://github.com/mmoll))
 
 **Implemented enhancements:**
 
@@ -19,7 +49,6 @@
 - Config file updates and FreeBSD refactorings [\#664](https://github.com/theforeman/puppet-puppet/pull/664) ([mmoll](https://github.com/mmoll))
 - Set more data types and document classes & defines [\#663](https://github.com/theforeman/puppet-puppet/pull/663) ([ekohl](https://github.com/ekohl))
 - Add unmanaged Puppet Agent runmode [\#659](https://github.com/theforeman/puppet-puppet/pull/659) ([Rathios](https://github.com/Rathios))
-- namespace extlib functions [\#639](https://github.com/theforeman/puppet-puppet/pull/639) ([mmoll](https://github.com/mmoll))
 
 **Merged pull requests:**
 
diff --git a/HISTORY.md b/HISTORY.md
index cc654219..8ede1abf 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,105 @@
+## [12.0.0](https://github.com/theforeman/puppet-puppet/tree/12.0.0) (2019-04-17)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/11.0.1...12.0.0)
+
+**Breaking changes:**
+
+- Use current timeout management variables [\#693](https://github.com/theforeman/puppet-puppet/pull/693) ([ekohl](https://github.com/ekohl))
+- remove Debian 8 support [\#688](https://github.com/theforeman/puppet-puppet/pull/688) ([mmoll](https://github.com/mmoll))
+- drop Puppet 4 [\#685](https://github.com/theforeman/puppet-puppet/pull/685) ([mmoll](https://github.com/mmoll))
+- drop EOL OSes [\#684](https://github.com/theforeman/puppet-puppet/pull/684) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- Configurable minute and hour for cronjob and systemd.timer [\#690](https://github.com/theforeman/puppet-puppet/pull/690) ([mauricemeyer](https://github.com/mauricemeyer))
+- add Puppetserver 6.3 auth.conf update [\#689](https://github.com/theforeman/puppet-puppet/pull/689) ([mmoll](https://github.com/mmoll))
+- add 2018 to osreleasemajor for agent\_restart\_command  [\#686](https://github.com/theforeman/puppet-puppet/pull/686) ([cabrinha](https://github.com/cabrinha))
+- Handle the pluginsync setting deprecation [\#683](https://github.com/theforeman/puppet-puppet/pull/683) ([ekohl](https://github.com/ekohl))
+- Move client\_certname to \[main\] [\#681](https://github.com/theforeman/puppet-puppet/pull/681) ([baurmatt](https://github.com/baurmatt))
+- Implement $server\_max\_open\_files [\#671](https://github.com/theforeman/puppet-puppet/pull/671) ([baurmatt](https://github.com/baurmatt))
+
+## [11.0.1](https://github.com/theforeman/puppet-puppet/tree/11.0.1) (2019-04-02)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/11.0.0...11.0.1)
+
+**Fixed bugs:**
+
+- Fixes [\#26199](https://projects.theforeman.org/issues/26199) - Fix dependency cycle when using git\_repo [\#682](https://github.com/theforeman/puppet-puppet/pull/682) ([ekohl](https://github.com/ekohl))
+- Quick fix for Windows agent restart loop \#678 [\#679](https://github.com/theforeman/puppet-puppet/pull/679) ([anthonysomerset](https://github.com/anthonysomerset))
+
+## [11.0.0](https://github.com/theforeman/puppet-puppet/tree/11.0.0) (2019-01-14)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/10.1.0...11.0.0)
+
+**Breaking changes:**
+
+- Remove left over environment entry [\#662](https://github.com/theforeman/puppet-puppet/pull/662) ([ekohl](https://github.com/ekohl))
+- remove apache dependency and leftovers [\#661](https://github.com/theforeman/puppet-puppet/pull/661) ([mmoll](https://github.com/mmoll))
+- Remove dynamic and config environments [\#653](https://github.com/theforeman/puppet-puppet/pull/653) ([ekohl](https://github.com/ekohl))
+- Remove passenger support [\#650](https://github.com/theforeman/puppet-puppet/pull/650) ([ekohl](https://github.com/ekohl))
+- Drop support for puppetserver \< 2.7 [\#649](https://github.com/theforeman/puppet-puppet/pull/649) ([ekohl](https://github.com/ekohl))
+- namespace extlib functions [\#639](https://github.com/theforeman/puppet-puppet/pull/639) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- Fixes [\#25839](https://projects.theforeman.org/issues/25839) - Determine puppetserver version in server.pp [\#668](https://github.com/theforeman/puppet-puppet/pull/668) ([ekohl](https://github.com/ekohl))
+- Remove $deb\_naio\_package & puppet-common install [\#665](https://github.com/theforeman/puppet-puppet/pull/665) ([ekohl](https://github.com/ekohl))
+- Config file updates and FreeBSD refactorings [\#664](https://github.com/theforeman/puppet-puppet/pull/664) ([mmoll](https://github.com/mmoll))
+- Set more data types and document classes & defines [\#663](https://github.com/theforeman/puppet-puppet/pull/663) ([ekohl](https://github.com/ekohl))
+- Add unmanaged Puppet Agent runmode [\#659](https://github.com/theforeman/puppet-puppet/pull/659) ([Rathios](https://github.com/Rathios))
+
+**Merged pull requests:**
+
+- add Puppetserver 5.x upgrade test [\#667](https://github.com/theforeman/puppet-puppet/pull/667) ([mmoll](https://github.com/mmoll))
+
+## [10.1.0](https://github.com/theforeman/puppet-puppet/tree/10.1.0) (2018-12-06)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/10.0.0...10.1.0)
+
+**Implemented enhancements:**
+
+- Add support for managing jetty threads [\#647](https://github.com/theforeman/puppet-puppet/pull/647) ([bastelfreak](https://github.com/bastelfreak))
+- Refactor testing and use data types in private classes [\#645](https://github.com/theforeman/puppet-puppet/pull/645) ([ekohl](https://github.com/ekohl))
+- Update CA related files for Puppetserver 5.3.6 [\#643](https://github.com/theforeman/puppet-puppet/pull/643) ([mmoll](https://github.com/mmoll))
+- Add Puppet 6 support [\#642](https://github.com/theforeman/puppet-puppet/pull/642) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- adjust puppetversion to puppetserver\_version mapping [\#651](https://github.com/theforeman/puppet-puppet/pull/651) ([mmoll](https://github.com/mmoll))
+
+## [10.0.0](https://github.com/theforeman/puppet-puppet/tree/10.0.0) (2018-10-16)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.1.0...10.0.0)
+
+**Breaking changes:**
+
+- don't use pupetlabs-hocon for metrics.conf [\#622](https://github.com/theforeman/puppet-puppet/pull/622) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-hocon for webserver.conf" [\#620](https://github.com/theforeman/puppet-puppet/pull/620) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-hocon for product.conf" [\#618](https://github.com/theforeman/puppet-puppet/pull/618) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-{hocon, puppet\_authorization} for auth.conf [\#615](https://github.com/theforeman/puppet-puppet/pull/615) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- reduce diff to Puppet distributed files [\#638](https://github.com/theforeman/puppet-puppet/pull/638) ([mmoll](https://github.com/mmoll))
+- Make `splaylimit` & `runinterval` types consistent [\#623](https://github.com/theforeman/puppet-puppet/pull/623) ([alexjfisher](https://github.com/alexjfisher))
+- add status service endpoint [\#621](https://github.com/theforeman/puppet-puppet/pull/621) ([mmoll](https://github.com/mmoll))
+- updated auth.conf for the "puppet facts upload" command \(puppetserver 5.5\) [\#619](https://github.com/theforeman/puppet-puppet/pull/619) ([slauger](https://github.com/slauger))
+- Add ability to configure custom\_trusted\_oid\_mapping.yaml [\#603](https://github.com/theforeman/puppet-puppet/pull/603) ([baurmatt](https://github.com/baurmatt))
+
+**Fixed bugs:**
+
+- Add shared gem path for Puppetserver \>= 5.3 [\#631](https://github.com/theforeman/puppet-puppet/pull/631) ([baurmatt](https://github.com/baurmatt))
+
+**Merged pull requests:**
+
+- Allow puppet/extlib 3 [\#637](https://github.com/theforeman/puppet-puppet/pull/637) ([alexjfisher](https://github.com/alexjfisher))
+- Use facter 3 facts during tests [\#636](https://github.com/theforeman/puppet-puppet/pull/636) ([alexjfisher](https://github.com/alexjfisher))
+- Contain classes [\#635](https://github.com/theforeman/puppet-puppet/pull/635) ([ekohl](https://github.com/ekohl))
+- Use `contain` instead of `anchor` pattern [\#627](https://github.com/theforeman/puppet-puppet/pull/627) ([alexjfisher](https://github.com/alexjfisher))
+- removing redundant \> character [\#626](https://github.com/theforeman/puppet-puppet/pull/626) ([attachmentgenie](https://github.com/attachmentgenie))
+- allow puppetlabs-stdlib 5.x [\#625](https://github.com/theforeman/puppet-puppet/pull/625) ([mmoll](https://github.com/mmoll))
+- allow puppetlabs-concat 5.x [\#624](https://github.com/theforeman/puppet-puppet/pull/624) ([mmoll](https://github.com/mmoll))
+
 ## [9.1.0](https://github.com/theforeman/puppet-puppet/tree/9.1.0) (2018-07-16)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.0.3...9.1.0)
diff --git a/metadata.json b/metadata.json
index ca26fb85..d483a6f9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "theforeman-puppet",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",