diff --git a/AUTHORS.md b/AUTHORS.md
index 369ee918..c71fdd9a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>|[@fintanmm](https://github.com/fintanmm)|100
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|33
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|14
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|12
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|13
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|11
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|10
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/26431172?v=4' width='36' height='36' alt='@preussal'>|[@preussal](https://github.com/preussal)|9
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7206d0cc..384f7003 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+# [0.18.0](https://github.com/saltstack-formulas/tomcat-formula/compare/v0.17.2...v0.18.0) (2020-04-27)
+
+
+### Bug Fixes
+
+* **cluster:** set accumlator name ([51f2968](https://github.com/saltstack-formulas/tomcat-formula/commit/51f2968ed0014079d392b52fc613e181bce3501f))
+* **fedora:** use `ver: 9` (Jasper Listener deprecated in tomcat >= 8) ([ba9cbf1](https://github.com/saltstack-formulas/tomcat-formula/commit/ba9cbf12f79702b18eb0b5c95b62f219281f44fc))
+* **native:** use EPEL repo for `amazonlinux-2` ([242f063](https://github.com/saltstack-formulas/tomcat-formula/commit/242f06378e4e9772be9f3ebffbe26ed3ca45bdb3))
+* **server.xml:** replace tabs with spaces ([58d65f9](https://github.com/saltstack-formulas/tomcat-formula/commit/58d65f91e46aa2174985f4728da69e5efcd9c4ce))
+
+
+### Continuous Integration
+
+* **kitchen+travis+inspec:** merge test suites into single `default` suite ([429c56e](https://github.com/saltstack-formulas/tomcat-formula/commit/429c56e9b940e03f0b24ecb93540961fd450737b))
+
+
+### Documentation
+
+* **readme:** switch mixed-up state descriptions ([d43958f](https://github.com/saltstack-formulas/tomcat-formula/commit/d43958fe613312d74b5f78c973081a31c8a923f1))
+
+
+### Features
+
+* **osfingermap:** add settings for `debian-8` ([7c86d80](https://github.com/saltstack-formulas/tomcat-formula/commit/7c86d801ef492dc210ad8dc396502d9b60e0129b))
+
+
+### Tests
+
+* update and fix all tests (inc. provide files for comparison) ([50262c3](https://github.com/saltstack-formulas/tomcat-formula/commit/50262c3c012b0ebdb86810edd04793c31d2a0a79))
+
 ## [0.17.2](https://github.com/saltstack-formulas/tomcat-formula/compare/v0.17.1...v0.17.2) (2020-04-27)
 
 
diff --git a/FORMULA b/FORMULA
index a0d47516..4ab16211 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: tomcat
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.17.2
+version: 0.18.0
 release: 1
 minimum_version: 2017.7
 summary: tomcat formula
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 449cc9e9..eef7f4bc 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 14
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 12
+     - 13
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
      - `@javierbertoli <https://github.com/javierbertoli>`_
      - 11
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index b64b297b..97f456ba 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,42 @@
 Changelog
 =========
 
+`0.18.0 <https://github.com/saltstack-formulas/tomcat-formula/compare/v0.17.2...v0.18.0>`_ (2020-04-27)
+-----------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **cluster:** set accumlator name (\ `51f2968 <https://github.com/saltstack-formulas/tomcat-formula/commit/51f2968ed0014079d392b52fc613e181bce3501f>`_\ )
+* **fedora:** use ``ver: 9`` (Jasper Listener deprecated in tomcat >= 8) (\ `ba9cbf1 <https://github.com/saltstack-formulas/tomcat-formula/commit/ba9cbf12f79702b18eb0b5c95b62f219281f44fc>`_\ )
+* **native:** use EPEL repo for ``amazonlinux-2`` (\ `242f063 <https://github.com/saltstack-formulas/tomcat-formula/commit/242f06378e4e9772be9f3ebffbe26ed3ca45bdb3>`_\ )
+* **server.xml:** replace tabs with spaces (\ `58d65f9 <https://github.com/saltstack-formulas/tomcat-formula/commit/58d65f91e46aa2174985f4728da69e5efcd9c4ce>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+travis+inspec:** merge test suites into single ``default`` suite (\ `429c56e <https://github.com/saltstack-formulas/tomcat-formula/commit/429c56e9b940e03f0b24ecb93540961fd450737b>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **readme:** switch mixed-up state descriptions (\ `d43958f <https://github.com/saltstack-formulas/tomcat-formula/commit/d43958fe613312d74b5f78c973081a31c8a923f1>`_\ )
+
+Features
+^^^^^^^^
+
+
+* **osfingermap:** add settings for ``debian-8`` (\ `7c86d80 <https://github.com/saltstack-formulas/tomcat-formula/commit/7c86d801ef492dc210ad8dc396502d9b60e0129b>`_\ )
+
+Tests
+^^^^^
+
+
+* update and fix all tests (inc. provide files for comparison) (\ `50262c3 <https://github.com/saltstack-formulas/tomcat-formula/commit/50262c3c012b0ebdb86810edd04793c31d2a0a79>`_\ )
+
 `0.17.2 <https://github.com/saltstack-formulas/tomcat-formula/compare/v0.17.1...v0.17.2>`_ (2020-04-27)
 -----------------------------------------------------------------------------------------------------------