diff --git a/AUTHORS.md b/AUTHORS.md
index 388a20e..9c15959 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,38 +4,39 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
-|[@myii](https://github.com/myii)|43
-|[@aboe76](https://github.com/aboe76)|11
-|[@whiteinge](https://github.com/whiteinge)|9
-|[@cheuschober](https://github.com/cheuschober)|7
-|[@gravyboat](https://github.com/gravyboat)|6
-|[@thatch45](https://github.com/thatch45)|6
-|[@nmadhok](https://github.com/nmadhok)|4
-|[@kjkeane](https://github.com/kjkeane)|3
-|[@iggy](https://github.com/iggy)|2
-|[@dafyddj](https://github.com/dafyddj)|2
-|[@dimabutyrin](https://github.com/dimabutyrin)|2
-|[@jstrunk](https://github.com/jstrunk)|2
-|[@pcdummy](https://github.com/pcdummy)|2
-|[@sroegner](https://github.com/sroegner)|2
-|[@tampakrap](https://github.com/tampakrap)|2
-|[@puneetk](https://github.com/puneetk)|2
-|[@alxwr](https://github.com/alxwr)|2
-|[@daks](https://github.com/daks)|2
-|[@aaronm-cloudtek](https://github.com/aaronm-cloudtek)|1
-|[@landergate](https://github.com/landergate)|1
-|[@amontalban](https://github.com/amontalban)|1
-|[@backerman](https://github.com/backerman)|1
-|[@bryangwilliam](https://github.com/bryangwilliam)|1
-|[@cprima](https://github.com/cprima)|1
-|[@UtahDave](https://github.com/UtahDave)|1
-|[@terminalmage](https://github.com/terminalmage)|1
-|[@javierbertoli](https://github.com/javierbertoli)|1
-|[@xenadmin](https://github.com/xenadmin)|1
-|[@markwherry9](https://github.com/markwherry9)|1
-|[@adnanJP](https://github.com/adnanJP)|1
-|[@timwsuqld](https://github.com/timwsuqld)|1
+|[@myii](https://github.com/myii)|62
+|[@aboe76](https://github.com/aboe76)|11
+|[@whiteinge](https://github.com/whiteinge)|9
+|[@cheuschober](https://github.com/cheuschober)|7
+|[@gravyboat](https://github.com/gravyboat)|6
+|[@thatch45](https://github.com/thatch45)|6
+|[@nmadhok](https://github.com/nmadhok)|4
+|[@dafyddj](https://github.com/dafyddj)|3
+|[@kjkeane](https://github.com/kjkeane)|3
+|[@iggy](https://github.com/iggy)|2
+|[@dimabutyrin](https://github.com/dimabutyrin)|2
+|[@jstrunk](https://github.com/jstrunk)|2
+|[@pcdummy](https://github.com/pcdummy)|2
+|[@sroegner](https://github.com/sroegner)|2
+|[@tampakrap](https://github.com/tampakrap)|2
+|[@puneetk](https://github.com/puneetk)|2
+|[@alxwr](https://github.com/alxwr)|2
+|[@daks](https://github.com/daks)|2
+|[@aaronm-cloudtek](https://github.com/aaronm-cloudtek)|1
+|[@landergate](https://github.com/landergate)|1
+|[@amontalban](https://github.com/amontalban)|1
+|[@backerman](https://github.com/backerman)|1
+|[@bryangwilliam](https://github.com/bryangwilliam)|1
+|[@cprima](https://github.com/cprima)|1
+|[@baby-gnu](https://github.com/baby-gnu)|1
+|[@UtahDave](https://github.com/UtahDave)|1
+|[@terminalmage](https://github.com/terminalmage)|1
+|[@javierbertoli](https://github.com/javierbertoli)|1
+|[@xenadmin](https://github.com/xenadmin)|1
+|[@markwherry9](https://github.com/markwherry9)|1
+|[@adnanJP](https://github.com/adnanJP)|1
+|[@timwsuqld](https://github.com/timwsuqld)|1
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-16.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-23.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 208da76..5ef3508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
# Changelog
+# [0.20.0](https://github.com/saltstack-formulas/ntp-formula/compare/v0.19.2...v0.20.0) (2021-06-23)
+
+
+### Continuous Integration
+
+* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([c65152e](https://github.com/saltstack-formulas/ntp-formula/commit/c65152ec3092174823efc0eece352d21ad20ca4b))
+* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([4ce7361](https://github.com/saltstack-formulas/ntp-formula/commit/4ce73614b619db52e59f37d106b447117e098d3a))
+* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([406efce](https://github.com/saltstack-formulas/ntp-formula/commit/406efceff01bcbc3616ca3f2d13b3c5d67a7776d))
+* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([ea5fd3e](https://github.com/saltstack-formulas/ntp-formula/commit/ea5fd3e26373ad194145efa0257cdd7775c66486))
+* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([00a5fc2](https://github.com/saltstack-formulas/ntp-formula/commit/00a5fc22fb0e0445114507fe3ef5bc190d3ab99b))
+* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([59c1654](https://github.com/saltstack-formulas/ntp-formula/commit/59c1654c2eda3978af1a60bdf1faf4857bc75c07))
+* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([e730fd3](https://github.com/saltstack-formulas/ntp-formula/commit/e730fd3fdcc7957cd1259e40ec3665585e348a10))
+* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([b450464](https://github.com/saltstack-formulas/ntp-formula/commit/b4504642be9638bbad2f3c1e9a7407271a4ee99b))
+* **pre-commit:** update hook for `rubocop` [skip ci] ([ea14cbb](https://github.com/saltstack-formulas/ntp-formula/commit/ea14cbbad71803b5c1a33d95e9aa324b09d40d6a))
+
+
+### Features
+
+* **map.jinja:** specify package for Fedora 34 ([0616c83](https://github.com/saltstack-formulas/ntp-formula/commit/0616c8340298b9cc3cdb8ef7b00d1ca02e23bf35))
+* **ng/map:** add configuration for Gentoo ([fa2f8bb](https://github.com/saltstack-formulas/ntp-formula/commit/fa2f8bbafd040dc400d24baf21cd3190fcb7836d))
+
+
+### Reverts
+
+* **container:** respect `ConditionVirtualization` service setting ([28c27c1](https://github.com/saltstack-formulas/ntp-formula/commit/28c27c1bec74787f3fa3b1966e762e8012243373))
+
+
+### Tests
+
+* **service:** add helper state to run service in containers ([2bdc85c](https://github.com/saltstack-formulas/ntp-formula/commit/2bdc85c41a16f3f4bbb4b8df05e0589457ef754c))
+* standardise use of `share` suite & `_mapdata` state [skip ci] ([a23eff8](https://github.com/saltstack-formulas/ntp-formula/commit/a23eff88df9e5bc63b7dd464381c1f01add70106))
+
## [0.19.2](https://github.com/saltstack-formulas/ntp-formula/compare/v0.19.1...v0.19.2) (2020-12-16)
diff --git a/FORMULA b/FORMULA
index d5ffd99..74d8fdd 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: ntp
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, 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.19.2
+version: 0.20.0
release: 1
minimum_version: 2017.7
summary: ntp formula
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index fbb1244..30fd30b 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -13,101 +13,104 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - Avatar
- Contributor
- Contributions
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@myii `_
- - 43
- * - :raw-html-m2r:``
+ - 62
+ * - :raw-html-m2r:``
- `@aboe76 `_
- 11
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@whiteinge `_
- 9
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@cheuschober `_
- 7
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@gravyboat `_
- 6
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@thatch45 `_
- 6
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@nmadhok `_
- 4
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@dafyddj `_
+ - 3
+ * - :raw-html-m2r:``
- `@kjkeane `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@iggy `_
- 2
- * - :raw-html-m2r:``
- - `@dafyddj `_
- - 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@dimabutyrin `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@jstrunk `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@pcdummy `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@sroegner `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@tampakrap `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@puneetk `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@alxwr `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@daks `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@aaronm-cloudtek `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@landergate `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@amontalban `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@backerman `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bryangwilliam `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@cprima `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@baby-gnu `_
+ - 1
+ * - :raw-html-m2r:``
- `@UtahDave `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@terminalmage `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@javierbertoli `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@xenadmin `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@markwherry9 `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@adnanJP `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@timwsuqld `_
- 1
----
-Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-12-16.
+Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-23.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 019d064..c049f55 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,43 @@
Changelog
=========
+`0.20.0 `_ (2021-06-23)
+--------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `c65152e `_\ )
+* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `4ce7361 `_\ )
+* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `406efce `_\ )
+* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `ea5fd3e `_\ )
+* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `00a5fc2 `_\ )
+* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `59c1654 `_\ )
+* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `e730fd3 `_\ )
+* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `b450464 `_\ )
+* **pre-commit:** update hook for ``rubocop`` [skip ci] (\ `ea14cbb `_\ )
+
+Features
+^^^^^^^^
+
+
+* **map.jinja:** specify package for Fedora 34 (\ `0616c83 `_\ )
+* **ng/map:** add configuration for Gentoo (\ `fa2f8bb `_\ )
+
+Reverts
+^^^^^^^
+
+
+* **container:** respect ``ConditionVirtualization`` service setting (\ `28c27c1 `_\ )
+
+Tests
+^^^^^
+
+
+* **service:** add helper state to run service in containers (\ `2bdc85c `_\ )
+* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `a23eff8 `_\ )
+
`0.19.2 `_ (2020-12-16)
--------------------------------------------------------------------------------------------------------