diff --git a/AUTHORS.md b/AUTHORS.md
index 06f885c..9ef33c2 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,46 +4,48 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
-|[@myii](https://github.com/myii)|62
-|[@EvaSDK](https://github.com/EvaSDK)|26
-|[@aboe76](https://github.com/aboe76)|23
-|[@nmadhok](https://github.com/nmadhok)|14
-|[@javierbertoli](https://github.com/javierbertoli)|13
-|[@fzipi](https://github.com/fzipi)|13
-|[@alxwr](https://github.com/alxwr)|11
-|[@gravyboat](https://github.com/gravyboat)|10
-|[@davidkarlsen](https://github.com/davidkarlsen)|10
-|[@ixs](https://github.com/ixs)|9
-|[@0xf10e](https://github.com/0xf10e)|9
-|[@imran1008](https://github.com/imran1008)|8
-|[@puneetk](https://github.com/puneetk)|7
-|[@danoe](https://github.com/danoe)|6
-|[@noelmcloughlin](https://github.com/noelmcloughlin)|3
-|[@thatch45](https://github.com/thatch45)|3
-|[@gtmanfred](https://github.com/gtmanfred)|2
-|[@stp-ip](https://github.com/stp-ip)|2
-|[@whiteinge](https://github.com/whiteinge)|2
-|[@iamseth](https://github.com/iamseth)|2
-|[@skylerberg](https://github.com/skylerberg)|2
-|[@babilen5](https://github.com/babilen5)|2
-|[@jasonious](https://github.com/jasonious)|2
-|[@jeroen92](https://github.com/jeroen92)|2
-|[@daks](https://github.com/daks)|2
-|[@asenci](https://github.com/asenci)|1
-|[@campbellmc](https://github.com/campbellmc)|1
-|[@dafyddj](https://github.com/dafyddj)|1
-|[@feiming](https://github.com/feiming)|1
-|[@pprkut](https://github.com/pprkut)|1
-|[@hoonetorg](https://github.com/hoonetorg)|1
-|[@techhat](https://github.com/techhat)|1
-|[@duk3luk3](https://github.com/duk3luk3)|1
-|[@mschiff](https://github.com/mschiff)|1
-|[@mgomersbach](https://github.com/mgomersbach)|1
-|[@n-rodriguez](https://github.com/n-rodriguez)|1
-|[@rhertzog](https://github.com/rhertzog)|1
-|[@kti-richard](https://github.com/kti-richard)|1
-|[@vquiering](https://github.com/vquiering)|1
+|[@myii](https://github.com/myii)|77
+|[@EvaSDK](https://github.com/EvaSDK)|26
+|[@aboe76](https://github.com/aboe76)|23
+|[@javierbertoli](https://github.com/javierbertoli)|14
+|[@nmadhok](https://github.com/nmadhok)|14
+|[@fzipi](https://github.com/fzipi)|13
+|[@alxwr](https://github.com/alxwr)|11
+|[@gravyboat](https://github.com/gravyboat)|10
+|[@davidkarlsen](https://github.com/davidkarlsen)|10
+|[@ixs](https://github.com/ixs)|9
+|[@0xf10e](https://github.com/0xf10e)|9
+|[@imran1008](https://github.com/imran1008)|8
+|[@puneetk](https://github.com/puneetk)|7
+|[@danoe](https://github.com/danoe)|6
+|[@dafyddj](https://github.com/dafyddj)|4
+|[@BT-dschleich](https://github.com/BT-dschleich)|3
+|[@noelmcloughlin](https://github.com/noelmcloughlin)|3
+|[@thatch45](https://github.com/thatch45)|3
+|[@gtmanfred](https://github.com/gtmanfred)|2
+|[@stp-ip](https://github.com/stp-ip)|2
+|[@whiteinge](https://github.com/whiteinge)|2
+|[@iamseth](https://github.com/iamseth)|2
+|[@skylerberg](https://github.com/skylerberg)|2
+|[@babilen5](https://github.com/babilen5)|2
+|[@jasonious](https://github.com/jasonious)|2
+|[@jeroen92](https://github.com/jeroen92)|2
+|[@daks](https://github.com/daks)|2
+|[@asenci](https://github.com/asenci)|1
+|[@campbellmc](https://github.com/campbellmc)|1
+|[@baby-gnu](https://github.com/baby-gnu)|1
+|[@feiming](https://github.com/feiming)|1
+|[@pprkut](https://github.com/pprkut)|1
+|[@hoonetorg](https://github.com/hoonetorg)|1
+|[@techhat](https://github.com/techhat)|1
+|[@duk3luk3](https://github.com/duk3luk3)|1
+|[@mschiff](https://github.com/mschiff)|1
+|[@mgomersbach](https://github.com/mgomersbach)|1
+|[@n-rodriguez](https://github.com/n-rodriguez)|1
+|[@rhertzog](https://github.com/rhertzog)|1
+|[@kti-richard](https://github.com/kti-richard)|1
+|[@vquiering](https://github.com/vquiering)|1
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-10-02.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-15.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52677a5..1dea6cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
# Changelog
+# [2.0.0](https://github.com/saltstack-formulas/postfix-formula/compare/v1.2.2...v2.0.0) (2021-03-15)
+
+
+### Bug Fixes
+
+* **resources:** make resources' IDs unique ([03ad48b](https://github.com/saltstack-formulas/postfix-formula/commit/03ad48b8a4b0b05144d449c9caee998ad6d0628f))
+
+
+### Continuous Integration
+
+* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([381b150](https://github.com/saltstack-formulas/postfix-formula/commit/381b150b0f1d0ab41e60f0ac95a7a6163633d701))
+* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([c5851e6](https://github.com/saltstack-formulas/postfix-formula/commit/c5851e67a2125c5367b3ab97b46c6407aa66eaf1))
+* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([22fa184](https://github.com/saltstack-formulas/postfix-formula/commit/22fa184b14e88a05d4c4284c459a7d887501e404))
+* **gitlab-ci:** use GitLab CI as Travis CI replacement ([890f3ae](https://github.com/saltstack-formulas/postfix-formula/commit/890f3aebc63484d07f887c870f2825797ba504e9))
+* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([19617a0](https://github.com/saltstack-formulas/postfix-formula/commit/19617a0ad710914c8f4439044d7bf993e1effcc8))
+* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([d65a7a3](https://github.com/saltstack-formulas/postfix-formula/commit/d65a7a36c28e3881b058e9c5b898a0f39c5e1ca7))
+* **pre-commit:** add to formula [skip ci] ([f41392d](https://github.com/saltstack-formulas/postfix-formula/commit/f41392d4504cb60b2fcf2c818cfe97f5487e2844))
+* **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([fb5be95](https://github.com/saltstack-formulas/postfix-formula/commit/fb5be9504ec18c86bab4f387bf62ba816b3ffa64))
+* **pre-commit:** finalise `rstcheck` configuration [skip ci] ([75941ed](https://github.com/saltstack-formulas/postfix-formula/commit/75941ed61443c84c27fea864d0529461564d8969))
+* **pre-commit:** update hook for `rubocop` [skip ci] ([c60d58e](https://github.com/saltstack-formulas/postfix-formula/commit/c60d58eb1168c031c12d656c9605f83afebc9fa1))
+
+
+### BREAKING CHANGES
+
+* **resources:** as all resources' IDs changed, other formulas
+depending on this formula's resources will need to be modified
+accordingly.
+
## [1.2.2](https://github.com/saltstack-formulas/postfix-formula/compare/v1.2.1...v1.2.2) (2020-10-02)
diff --git a/FORMULA b/FORMULA
index 813dbaa..ac41717 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: postfix
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE
os_family: Debian, RedHat, Suse
-version: 1.2.2
+version: 2.0.0
release: 1
minimum_version: 2016.11
summary: Postfix formula
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 32717d0..414f935 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -13,125 +13,131 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - Avatar
- Contributor
- Contributions
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@myii `_
- - 62
- * - :raw-html-m2r:``
+ - 77
+ * - :raw-html-m2r:``
- `@EvaSDK `_
- 26
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@aboe76 `_
- 23
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@javierbertoli `_
+ - 14
+ * - :raw-html-m2r:``
- `@nmadhok `_
- 14
- * - :raw-html-m2r:``
- - `@javierbertoli `_
- - 13
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@fzipi `_
- 13
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@alxwr `_
- 11
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@gravyboat `_
- 10
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@davidkarlsen `_
- 10
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@ixs `_
- 9
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@0xf10e `_
- 9
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@imran1008 `_
- 8
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@puneetk `_
- 7
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@danoe `_
- 6
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@dafyddj `_
+ - 4
+ * - :raw-html-m2r:``
+ - `@BT-dschleich `_
+ - 3
+ * - :raw-html-m2r:``
- `@noelmcloughlin `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@thatch45 `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@gtmanfred `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@stp-ip `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@whiteinge `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@iamseth `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@skylerberg `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@babilen5 `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@jasonious `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@jeroen92 `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@daks `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@asenci `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@campbellmc `_
- 1
- * - :raw-html-m2r:``
- - `@dafyddj `_
+ * - :raw-html-m2r:``
+ - `@baby-gnu `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@feiming `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@pprkut `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@hoonetorg `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@techhat `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@duk3luk3 `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@mschiff `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@mgomersbach `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@n-rodriguez `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@rhertzog `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@kti-richard `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@vquiering `_
- 1
----
-Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-10-02.
+Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-15.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 7e892ae..e4971f0 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,38 @@
Changelog
=========
+`2.0.0 `_ (2021-03-15)
+---------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **resources:** make resources' IDs unique (\ `03ad48b `_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `381b150 `_\ )
+* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `c5851e6 `_\ )
+* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `22fa184 `_\ )
+* **gitlab-ci:** use GitLab CI as Travis CI replacement (\ `890f3ae `_\ )
+* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `19617a0 `_\ )
+* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `d65a7a3 `_\ )
+* **pre-commit:** add to formula [skip ci] (\ `f41392d `_\ )
+* **pre-commit:** enable/disable ``rstcheck`` as relevant [skip ci] (\ `fb5be95 `_\ )
+* **pre-commit:** finalise ``rstcheck`` configuration [skip ci] (\ `75941ed `_\ )
+* **pre-commit:** update hook for ``rubocop`` [skip ci] (\ `c60d58e `_\ )
+
+BREAKING CHANGES
+^^^^^^^^^^^^^^^^
+
+
+* **resources:** as all resources' IDs changed, other formulas
+ depending on this formula's resources will need to be modified
+ accordingly.
+
`1.2.2 `_ (2020-10-02)
---------------------------------------------------------------------------------------------------------