diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd0a7d2..b8ca7b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,69 +1,166 @@
 # Changelog
 
-## 2017-02-11 Release 2.3.0
+All notable changes to this project will be documented in this file.
+Each new release typically also includes the latest modulesync defaults.
+These should not affect the functionality of the module.
 
-This is the last release with Puppet3 support!
-* Make facts.sh sh compatible
-* Add additional parameter data_dir for seperate data from home user directory
-* Make confluence_version a First Class Fact
-* Allow System Group
-* Use https instead of http for downloading confluence
-* Bump puppet minimum version_requirement to 3.8.7
-* Add support for configuring an AJP connector
+## [v3.0.0](https://github.com/voxpupuli/puppet-confluence/tree/v3.0.0) (2017-10-11)
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v2.3.0...v3.0.0)
 
-## 2016-08-18 Release 2.2.2
+**Implemented enhancements:**
 
-* Fix: Issue with a clean puppet 4 based install failure.
-* Modulesync with latest Vox Pupuli defaults
-
-
-## 2016-05-08 Release 2.2.1
-
-* delete the .pmtignore (is redundant with our .gitignore)
-
-
-## 2016-05-08 Release 2.2.0
-
-* Deprecate the downloadURL parameter
-* Add a systemd unit file for the RHEL 7 family
-* Use a service_file_template variable to reference init scripts
-* Add a context_path parameter to manage situations where Confluence is served from a sub-path to the base URL
-* Add manage_user parameter
-* Fix minimum required stdlib version
-* modulesync with voxpupuli defaults
-
-
-## 2014-03-22 Release 2.1.1
-
-(this is the first release made under the voxpupuli namespace. Older version were from mkrakowitzer)
-* Rewrite README file
-* Bump confluence version to 5.7.1
-* Update metadata, CHANGELOG to point to new namespace.
-* Add .pmtignore file
-
-
-## 2014-03-22 Release 2.1.0
-
-Note: This is the final release of this module before it is deprecated with a 999.999.999 version. This module will be moving the the puppet-community namespace on github and the puppet namespace on puppetforge soon.
-
-* Make confluence users shell configurable.
-* update README, metadata, .travis.yml
-* Add CONTRIBUTING.md and test coverage spec.
-
-
-## 2014-01-23 Release 2.0.1
-* Resolve issue #22 - confluence_version fact detects wrong version
-* Resolve issue #20 - param manage_server_xml acceptCount option is duplicated
-
-
-## 2014-01-21 Release 2.0.0
-
-* Replace mkrakowitzer-deploy with nanlui-staging as default for dropping files.
-* Add tests
-* Resolve issue #7 Make tomcat port / tomcat parameters configurable.
-* Add parameter manage_server_xml, tomcat_max_threads, tomcat_accept_count, tomcat_extras.
-* Add tests
-* rename parameter proxy to tomcat_proxy, port to tomcat_port.
-* Add support for STRICT_VARIABLES=yes FUTURE_PARSER=yes
-* Resole issue #6 Handle confluence upgrades smoothly
-* This will stop confluence if running version is less than manifest version. Attempt to upgrade and then start confluence.
+- Add proxy support when using 'archive' [\#138](https://github.com/voxpupuli/puppet-confluence/pull/138) ([bt-lemery](https://github.com/bt-lemery))
+- set confluence.home to homedir if data\_dir is empty [\#112](https://github.com/voxpupuli/puppet-confluence/pull/112) ([kpankonen](https://github.com/kpankonen))
+
+**Fixed bugs:**
+
+- confluence.home isn't set if data\_dir isn't parameter isn't set [\#111](https://github.com/voxpupuli/puppet-confluence/issues/111)
+- Fix augeas expression to properly set context path instead of failing silently with multiple contexts [\#130](https://github.com/voxpupuli/puppet-confluence/pull/130) ([Tokynet](https://github.com/Tokynet))
+- Fix $homedir typo [\#128](https://github.com/voxpupuli/puppet-confluence/pull/128) ([binford2k](https://github.com/binford2k))
+
+**Closed issues:**
+
+- $data\_dir should be documented in ReadMe [\#129](https://github.com/voxpupuli/puppet-confluence/issues/129)
+- Support for Puppet 4 [\#39](https://github.com/voxpupuli/puppet-confluence/issues/39)
+
+**Merged pull requests:**
+
+- Use 'ps' for version fact [\#137](https://github.com/voxpupuli/puppet-confluence/pull/137) ([joshbeard](https://github.com/joshbeard))
+- Fix incorrect failures with rspec-puppet-facts [\#136](https://github.com/voxpupuli/puppet-confluence/pull/136) ([op-ct](https://github.com/op-ct))
+- Issue 119: updated facter script to not report java version [\#124](https://github.com/voxpupuli/puppet-confluence/pull/124) ([senax](https://github.com/senax))
+- replace validate\_\* with puppet4 datatypes & fix archive errors [\#122](https://github.com/voxpupuli/puppet-confluence/pull/122) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v2.3.0](https://github.com/voxpupuli/puppet-confluence/tree/v2.3.0) (2017-02-11)
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v2.2.2...v2.3.0)
+
+**Closed issues:**
+
+- Error in /etc/facter/facts.d/confluence\_facts.sh - \[\[: not found [\#82](https://github.com/voxpupuli/puppet-confluence/issues/82)
+
+**Merged pull requests:**
+
+- modulesync 0.16.8 [\#110](https://github.com/voxpupuli/puppet-confluence/pull/110) ([nibalizer](https://github.com/nibalizer))
+- modulesync 0.16.7 [\#109](https://github.com/voxpupuli/puppet-confluence/pull/109) ([bastelfreak](https://github.com/bastelfreak))
+- Bump minimum version dependencies \(for Puppet 4\) [\#108](https://github.com/voxpupuli/puppet-confluence/pull/108) ([juniorsysadmin](https://github.com/juniorsysadmin))
+- modulesync 0.16.6 [\#107](https://github.com/voxpupuli/puppet-confluence/pull/107) ([bastelfreak](https://github.com/bastelfreak))
+- modulesync 0.16.4 [\#106](https://github.com/voxpupuli/puppet-confluence/pull/106) ([bastelfreak](https://github.com/bastelfreak))
+- Bump puppet minimum version\_requirement to 3.8.7 [\#105](https://github.com/voxpupuli/puppet-confluence/pull/105) ([juniorsysadmin](https://github.com/juniorsysadmin))
+- Exposes checksum\_verify in init.pp w/ conditional. [\#103](https://github.com/voxpupuli/puppet-confluence/pull/103) ([sacres](https://github.com/sacres))
+- modulesync 0.16.3 [\#102](https://github.com/voxpupuli/puppet-confluence/pull/102) ([bastelfreak](https://github.com/bastelfreak))
+- Use https instead of http [\#101](https://github.com/voxpupuli/puppet-confluence/pull/101) ([dhoppe](https://github.com/dhoppe))
+- Add support for configuring an AJP connector [\#98](https://github.com/voxpupuli/puppet-confluence/pull/98) ([JCotton1123](https://github.com/JCotton1123))
+- Update based on voxpupuli/modulesync\_config 0.16.2 [\#96](https://github.com/voxpupuli/puppet-confluence/pull/96) ([dhoppe](https://github.com/dhoppe))
+- Make confluence\_version a First Class Fact [\#95](https://github.com/voxpupuli/puppet-confluence/pull/95) ([spjmurray](https://github.com/spjmurray))
+- Revert "Make confluence\_version a First Class Fact" [\#94](https://github.com/voxpupuli/puppet-confluence/pull/94) ([dhoppe](https://github.com/dhoppe))
+- Allow System Group [\#93](https://github.com/voxpupuli/puppet-confluence/pull/93) ([spjmurray](https://github.com/spjmurray))
+- Make confluence\_version a First Class Fact [\#92](https://github.com/voxpupuli/puppet-confluence/pull/92) ([spjmurray](https://github.com/spjmurray))
+- Modulesync 0.15.0 [\#91](https://github.com/voxpupuli/puppet-confluence/pull/91) ([alexjfisher](https://github.com/alexjfisher))
+- Added parameter for alternative data dir [\#90](https://github.com/voxpupuli/puppet-confluence/pull/90) ([tgeci](https://github.com/tgeci))
+- Add missing badges [\#89](https://github.com/voxpupuli/puppet-confluence/pull/89) ([dhoppe](https://github.com/dhoppe))
+- Update based on voxpupuli/modulesync\_config 0.14.1 [\#88](https://github.com/voxpupuli/puppet-confluence/pull/88) ([dhoppe](https://github.com/dhoppe))
+- Update based on voxpupuli/modulesync\_config 0.13.3 [\#87](https://github.com/voxpupuli/puppet-confluence/pull/87) ([dhoppe](https://github.com/dhoppe))
+- modulesync 0.13.0 [\#86](https://github.com/voxpupuli/puppet-confluence/pull/86) ([bbriggs](https://github.com/bbriggs))
+- Update based on voxpupuli/modulesync\_config 0.12.7 [\#85](https://github.com/voxpupuli/puppet-confluence/pull/85) ([dhoppe](https://github.com/dhoppe))
+- Update based on voxpupuli/modulesync\_config 0.12.6 [\#84](https://github.com/voxpupuli/puppet-confluence/pull/84) ([dhoppe](https://github.com/dhoppe))
+- make facts.sh sh compatible [\#83](https://github.com/voxpupuli/puppet-confluence/pull/83) ([mookie-](https://github.com/mookie-))
+
+## [v2.2.2](https://github.com/voxpupuli/puppet-confluence/tree/v2.2.2) (2016-08-18)
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v2.2.1...v2.2.2)
+
+**Closed issues:**
+
+- Parameter name in README is wrong [\#76](https://github.com/voxpupuli/puppet-confluence/issues/76)
+- Clean install fails [\#74](https://github.com/voxpupuli/puppet-confluence/issues/74)
+
+**Merged pull requests:**
+
+- Modulesync 0.12.1 & Release 2.2.2 [\#81](https://github.com/voxpupuli/puppet-confluence/pull/81) ([bastelfreak](https://github.com/bastelfreak))
+- modulesync 0.11.1 [\#80](https://github.com/voxpupuli/puppet-confluence/pull/80) ([bastelfreak](https://github.com/bastelfreak))
+- modulesync 0.11.0 [\#79](https://github.com/voxpupuli/puppet-confluence/pull/79) ([bastelfreak](https://github.com/bastelfreak))
+- Update README.md [\#78](https://github.com/voxpupuli/puppet-confluence/pull/78) ([circuitousNerd](https://github.com/circuitousNerd))
+- modulesync 0.9.1 [\#77](https://github.com/voxpupuli/puppet-confluence/pull/77) ([bastelfreak](https://github.com/bastelfreak))
+- Fixes \#74 : Correct confluence\_version to fix clean install on Puppet 4 [\#75](https://github.com/voxpupuli/puppet-confluence/pull/75) ([jhg03a](https://github.com/jhg03a))
+- Modulesync 0.8.0 [\#73](https://github.com/voxpupuli/puppet-confluence/pull/73) ([bastelfreak](https://github.com/bastelfreak))
+- Update based on voxpupuli/modulesync\_config [\#72](https://github.com/voxpupuli/puppet-confluence/pull/72) ([dhoppe](https://github.com/dhoppe))
+
+## [v2.2.1](https://github.com/voxpupuli/puppet-confluence/tree/v2.2.1) (2016-05-12)
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/v2.2.0...v2.2.1)
+
+**Merged pull requests:**
+
+- Release 2.2.1 [\#71](https://github.com/voxpupuli/puppet-confluence/pull/71) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v2.2.0](https://github.com/voxpupuli/puppet-confluence/tree/v2.2.0) (2016-05-08)
+[Full Changelog](https://github.com/voxpupuli/puppet-confluence/compare/2.1.1...v2.2.0)
+
+**Closed issues:**
+
+- Where is the template confluence.service.erb [\#47](https://github.com/voxpupuli/puppet-confluence/issues/47)
+- Missing default value for $javahome. [\#43](https://github.com/voxpupuli/puppet-confluence/issues/43)
+- Add SSL Support [\#38](https://github.com/voxpupuli/puppet-confluence/issues/38)
+- Need ability to set context path. [\#36](https://github.com/voxpupuli/puppet-confluence/issues/36)
+- Submit to puppet forge under "puppetcommunity" vendor [\#32](https://github.com/voxpupuli/puppet-confluence/issues/32)
+- Add \<Context\> path attribute as a parameter for jira class [\#21](https://github.com/voxpupuli/puppet-confluence/issues/21)
+- Add systemd service file for RHEL7 [\#19](https://github.com/voxpupuli/puppet-confluence/issues/19)
+- Readme needs to be rewritten to comply with puppetlabs guidelines. [\#17](https://github.com/voxpupuli/puppet-confluence/issues/17)
+
+**Merged pull requests:**
+
+- add note about the original author [\#70](https://github.com/voxpupuli/puppet-confluence/pull/70) ([bastelfreak](https://github.com/bastelfreak))
+- prepare for 2.2.0 release [\#68](https://github.com/voxpupuli/puppet-confluence/pull/68) ([bastelfreak](https://github.com/bastelfreak))
+- modulesync 0.6.0 [\#67](https://github.com/voxpupuli/puppet-confluence/pull/67) ([bastelfreak](https://github.com/bastelfreak))
+- Update based on voxpupuli/modulesync\_config [\#66](https://github.com/voxpupuli/puppet-confluence/pull/66) ([dhoppe](https://github.com/dhoppe))
+- Update based on voxpupuli/modulesync\_config [\#64](https://github.com/voxpupuli/puppet-confluence/pull/64) ([dhoppe](https://github.com/dhoppe))
+- Update based on voxpupuli/modulesync\_config [\#63](https://github.com/voxpupuli/puppet-confluence/pull/63) ([dhoppe](https://github.com/dhoppe))
+- Use module voxpupuli/archive instead of mkrakowitzer/deploy [\#60](https://github.com/voxpupuli/puppet-confluence/pull/60) ([dhoppe](https://github.com/dhoppe))
+- Remove uppercase parameters [\#59](https://github.com/voxpupuli/puppet-confluence/pull/59) ([dhoppe](https://github.com/dhoppe))
+- Check for required parameter javahome [\#58](https://github.com/voxpupuli/puppet-confluence/pull/58) ([dhoppe](https://github.com/dhoppe))
+- Add crowd SSO functionality [\#57](https://github.com/voxpupuli/puppet-confluence/pull/57) ([patricktoelle](https://github.com/patricktoelle))
+- Update based on voxpupuli/modulesync\_config [\#56](https://github.com/voxpupuli/puppet-confluence/pull/56) ([dhoppe](https://github.com/dhoppe))
+- Fix TravisCI badge [\#52](https://github.com/voxpupuli/puppet-confluence/pull/52) ([juniorsysadmin](https://github.com/juniorsysadmin))
+- centos 7 service template fixes [\#51](https://github.com/voxpupuli/puppet-confluence/pull/51) ([dmm92](https://github.com/dmm92))
+- Prepare for 2.2.0 release [\#50](https://github.com/voxpupuli/puppet-confluence/pull/50) ([juniorsysadmin](https://github.com/juniorsysadmin))
+- Deprecate the downloadURL parameter [\#49](https://github.com/voxpupuli/puppet-confluence/pull/49) ([juniorsysadmin](https://github.com/juniorsysadmin))
+- Install systemd file before starting [\#48](https://github.com/voxpupuli/puppet-confluence/pull/48) ([ericlaflamme](https://github.com/ericlaflamme))
+- Add systemd unit file [\#46](https://github.com/voxpupuli/puppet-confluence/pull/46) ([jasonhancock](https://github.com/jasonhancock))
+- Moved initscript into service module and template uses variable [\#41](https://github.com/voxpupuli/puppet-confluence/pull/41) ([jacobmw](https://github.com/jacobmw))
+- Manage context\_path [\#40](https://github.com/voxpupuli/puppet-confluence/pull/40) ([joshbeard](https://github.com/joshbeard))
+- Add manage\_user parameter [\#37](https://github.com/voxpupuli/puppet-confluence/pull/37) ([choffee](https://github.com/choffee))
+- Update metadata.json w/ stdlib 4 [\#35](https://github.com/voxpupuli/puppet-confluence/pull/35) ([dudemcbacon](https://github.com/dudemcbacon))
+
+## [2.1.1](https://github.com/voxpupuli/puppet-confluence/tree/2.1.1) (2015-03-22)
+**Closed issues:**
+
+- update .travis.yaml to deploy to puppet-community [\#28](https://github.com/voxpupuli/puppet-confluence/issues/28)
+- make confluence users shell configurable. [\#25](https://github.com/voxpupuli/puppet-confluence/issues/25)
+- confluence\_version fact does not correctly pick up running version [\#22](https://github.com/voxpupuli/puppet-confluence/issues/22)
+- When using param manage\_server\_xml =\> 'template' acceptCount option is duplicated. [\#20](https://github.com/voxpupuli/puppet-confluence/issues/20)
+- Init script for Debian is missing LSB-Tags [\#9](https://github.com/voxpupuli/puppet-confluence/issues/9)
+- Make MaxPermSize parameter configurable [\#8](https://github.com/voxpupuli/puppet-confluence/issues/8)
+- Make tomcat port / tomcat parameters configurable [\#7](https://github.com/voxpupuli/puppet-confluence/issues/7)
+- handle confluence upgrades smoothly [\#6](https://github.com/voxpupuli/puppet-confluence/issues/6)
+- replace deploy module with staging as the default. [\#5](https://github.com/voxpupuli/puppet-confluence/issues/5)
+
+**Merged pull requests:**
+
+- Namespace change [\#31](https://github.com/voxpupuli/puppet-confluence/pull/31) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- \(Issue \#28\) Update .travis.yml to autodeploy module [\#30](https://github.com/voxpupuli/puppet-confluence/pull/30) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Bump to version 2.1.0 [\#27](https://github.com/voxpupuli/puppet-confluence/pull/27) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Issue \#25 Make confluence users shell configurable. [\#26](https://github.com/voxpupuli/puppet-confluence/pull/26) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Issue20 [\#24](https://github.com/voxpupuli/puppet-confluence/pull/24) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Resolve \#22 - confluence\_version fact detects wrong version [\#23](https://github.com/voxpupuli/puppet-confluence/pull/23) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Issue6 [\#18](https://github.com/voxpupuli/puppet-confluence/pull/18) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Make tomcat port / tomcat parameters configurable \#7 [\#16](https://github.com/voxpupuli/puppet-confluence/pull/16) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Enable strict mode for travis tests [\#15](https://github.com/voxpupuli/puppet-confluence/pull/15) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- F3792625/prep for v2 [\#14](https://github.com/voxpupuli/puppet-confluence/pull/14) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- \(Issue \#5\) Replace mkrakowitzer-deploy with nanliu-staging [\#13](https://github.com/voxpupuli/puppet-confluence/pull/13) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Add initial beaker acceptance tests [\#12](https://github.com/voxpupuli/puppet-confluence/pull/12) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Update and add missing LSB information to init script. Resolves issue \#9 [\#11](https://github.com/voxpupuli/puppet-confluence/pull/11) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- rename rspec-tests and add test for the main class [\#10](https://github.com/voxpupuli/puppet-confluence/pull/10) ([gerhardsam](https://github.com/gerhardsam))
+- F3792625/permgen [\#4](https://github.com/voxpupuli/puppet-confluence/pull/4) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- F3792625/add tests [\#2](https://github.com/voxpupuli/puppet-confluence/pull/2) ([mkrakowitzer](https://github.com/mkrakowitzer))
+- Changes to ensure confluence service starts on reboot [\#1](https://github.com/voxpupuli/puppet-confluence/pull/1) ([brucem](https://github.com/brucem))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/metadata.json b/metadata.json
index 5c31fd7..2e64b48 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-confluence",
-  "version": "3.0.0-rc0",
+  "version": "3.0.0",
   "author": "Vox Pupuli",
   "summary": "Install atlassian confluence",
   "license": "MIT",