diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0b24df5..c85a23507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,55 @@ 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.
 
-## [v9.1.0](https://github.com/voxpupuli/puppet-zabbix/tree/v9.1.0) (2021-08-04)
+## [v9.2.0](https://github.com/voxpupuli/puppet-zabbix/tree/v9.2.0) (2022-06-03)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-zabbix/compare/v9.1.0...v9.2.0)
+
+**Implemented enhancements:**
+
+- Add Zabbix 6.0 support [\#820](https://github.com/voxpupuli/puppet-zabbix/pull/820) ([root-expert](https://github.com/root-expert))
+- add zabbix-server options StartReportWriters and WebServiceURL. [\#811](https://github.com/voxpupuli/puppet-zabbix/pull/811) ([Heidistein](https://github.com/Heidistein))
+- Add AIX 7 support [\#807](https://github.com/voxpupuli/puppet-zabbix/pull/807) ([cchallenorskytap](https://github.com/cchallenorskytap))
+- Add RedHat 8 support [\#805](https://github.com/voxpupuli/puppet-zabbix/pull/805) ([tjikkun](https://github.com/tjikkun))
+- Added ability to keep templates in sync \(no manual changes\) [\#803](https://github.com/voxpupuli/puppet-zabbix/pull/803) ([Fabian1976](https://github.com/Fabian1976))
+- Bump lower bound of systemd to 3.1.0 [\#791](https://github.com/voxpupuli/puppet-zabbix/pull/791) ([root-expert](https://github.com/root-expert))
+- Allow MSI package install on Windows [\#790](https://github.com/voxpupuli/puppet-zabbix/pull/790) ([spicyprogramming](https://github.com/spicyprogramming))
+- Add Debian 11 support [\#784](https://github.com/voxpupuli/puppet-zabbix/pull/784) ([root-expert](https://github.com/root-expert))
+
+**Fixed bugs:**
+
+- Agent service needs to require the startup script [\#788](https://github.com/voxpupuli/puppet-zabbix/issues/788)
+-  Fix \#817 - startup\_script fails for windows [\#818](https://github.com/voxpupuli/puppet-zabbix/pull/818) ([logicminds](https://github.com/logicminds))
+- Fix typo in repo.pp [\#816](https://github.com/voxpupuli/puppet-zabbix/pull/816) ([root-expert](https://github.com/root-expert))
+- Default denykey to undef [\#813](https://github.com/voxpupuli/puppet-zabbix/pull/813) ([root-expert](https://github.com/root-expert))
+- set ipaddress to empty string if agent\_use\_ip is false [\#810](https://github.com/voxpupuli/puppet-zabbix/pull/810) ([mergwyn](https://github.com/mergwyn))
+- Respect manage\_repo for RedHat family [\#801](https://github.com/voxpupuli/puppet-zabbix/pull/801) ([fraenki](https://github.com/fraenki))
+- Require startup script for the zabbix agent service [\#794](https://github.com/voxpupuli/puppet-zabbix/pull/794) ([root-expert](https://github.com/root-expert))
+- Add code to ensure interfacedetails is always a hash [\#793](https://github.com/voxpupuli/puppet-zabbix/pull/793) ([oraziobattaglia](https://github.com/oraziobattaglia))
+- Added details to host network interface to configure SNMP hosts [\#785](https://github.com/voxpupuli/puppet-zabbix/pull/785) ([oraziobattaglia](https://github.com/oraziobattaglia))
+
+**Closed issues:**
+
+- startup\_script fails for windows [\#817](https://github.com/voxpupuli/puppet-zabbix/issues/817)
+- Zabbix 6.0 [\#814](https://github.com/voxpupuli/puppet-zabbix/issues/814)
+- DenyKey active by default even if denykey =\> undef, [\#812](https://github.com/voxpupuli/puppet-zabbix/issues/812)
+- ipaddress should be set to empty string if agent\_use\_ip is false [\#809](https://github.com/voxpupuli/puppet-zabbix/issues/809)
+- no parameter named 'interfacedetails'  [\#804](https://github.com/voxpupuli/puppet-zabbix/issues/804)
+- Keychain for Zabbix repo certificate verify failed [\#800](https://github.com/voxpupuli/puppet-zabbix/issues/800)
+- Add support for CentOS/RHEL 8 [\#643](https://github.com/voxpupuli/puppet-zabbix/issues/643)
+- Add status property to zabbix\_host resource [\#606](https://github.com/voxpupuli/puppet-zabbix/issues/606)
+
+**Merged pull requests:**
+
+- Ubuntu: Install lsb-release during CI [\#819](https://github.com/voxpupuli/puppet-zabbix/pull/819) ([bastelfreak](https://github.com/bastelfreak))
+- cleanup .fixtures.yml [\#806](https://github.com/voxpupuli/puppet-zabbix/pull/806) ([bastelfreak](https://github.com/bastelfreak))
+- Run unit tests on only on major OS versions [\#795](https://github.com/voxpupuli/puppet-zabbix/pull/795) ([bastelfreak](https://github.com/bastelfreak))
+- zabbix::startup: use rspec-puppet-facts [\#792](https://github.com/voxpupuli/puppet-zabbix/pull/792) ([bastelfreak](https://github.com/bastelfreak))
+- Allow up-to-date dependencies [\#786](https://github.com/voxpupuli/puppet-zabbix/pull/786) ([smortex](https://github.com/smortex))
+- Use puppet-strings annotations/Generate REFERENCE.md [\#781](https://github.com/voxpupuli/puppet-zabbix/pull/781) ([root-expert](https://github.com/root-expert))
+- Update README.md with new badges/transfer notice [\#780](https://github.com/voxpupuli/puppet-zabbix/pull/780) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v9.1.0](https://github.com/voxpupuli/puppet-zabbix/tree/v9.1.0) (2021-08-05)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-zabbix/compare/v9.0.0...v9.1.0)
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 184d6b4a4..fc60ecfd6 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -45,7 +45,7 @@
 * [`zabbix_hostgroup`](#zabbix_hostgroup): Manage zabbix hostgroups
 * [`zabbix_proxy`](#zabbix_proxy): FQDN of the proxy.
 * [`zabbix_template`](#zabbix_template): The name of template.
-* [`zabbix_template_host`](#zabbix_template_host): Link or Unlink template to host. Example. Name should be in the format of "template_name@hostname"  zabbix_template_host{ 'mysql_template@db1
+* [`zabbix_template_host`](#zabbix_template_host): Link or Unlink template to host. Only for Zabbix < 6.0! Example. Name should be in the format of "template_name@hostname"  zabbix_template_ho
 * [`zabbix_userparameters`](#zabbix_userparameters): An unique name for this define.
 
 ### Data types
@@ -1334,6 +1334,7 @@ The following parameters are available in the `zabbix::agent` class:
 * [`manage_repo`](#manage_repo)
 * [`manage_choco`](#manage_choco)
 * [`zabbix_package_provider`](#zabbix_package_provider)
+* [`zabbix_package_source`](#zabbix_package_source)
 * [`manage_resources`](#manage_resources)
 * [`monitored_by_proxy`](#monitored_by_proxy)
 * [`agent_use_ip`](#agent_use_ip)
@@ -1343,6 +1344,7 @@ The following parameters are available in the `zabbix::agent` class:
 * [`zbx_templates`](#zbx_templates)
 * [`zbx_macros`](#zbx_macros)
 * [`zbx_interface_type`](#zbx_interface_type)
+* [`zbx_interface_details`](#zbx_interface_details)
 * [`agent_configfile_path`](#agent_configfile_path)
 * [`pidfile`](#pidfile)
 * [`servicename`](#servicename)
@@ -1465,6 +1467,14 @@ It is undef for all linux os and set to 'chocolatey' on windows.
 
 Default value: `$zabbix::params::zabbix_package_provider`
 
+##### <a name="zabbix_package_source"></a>`zabbix_package_source`
+
+Data type: `Optional[Stdlib::Windowspath]`
+
+Path to a Windows MSI file used to install the agent.
+
+Default value: ``undef``
+
 ##### <a name="manage_resources"></a>`manage_resources`
 
 Data type: `Boolean`
@@ -1538,15 +1548,23 @@ Default value: `[]`
 
 Data type: `Integer[1,4]`
 
-Integer specifying type of interface to be created
+Integer specifying type of interface to be created.
 
 Default value: `1`
 
+##### <a name="zbx_interface_details"></a>`zbx_interface_details`
+
+Data type: `Variant[Array, Hash]`
+
+Hash with interface details for SNMP when interface type is 2.
+
+Default value: `[]`
+
 ##### <a name="agent_configfile_path"></a>`agent_configfile_path`
 
 Data type: `Any`
 
-Agent config file path defaults to /etc/zabbix/zabbix_agentd.conf
+Agent config file path defaults to /etc/zabbix/zabbix_agentd.conf.
 
 Default value: `$zabbix::params::agent_configfile_path`
 
@@ -1586,7 +1604,7 @@ Default value: `$zabbix::params::agent_logfilesize`
 
 Data type: `Enum['console', 'file', 'system']`
 
-Specifies where log messages are written to. Can be one of: console, file, system
+Specifies where log messages are written to. Can be one of: console, file, system.
 
 Default value: `$zabbix::params::agent_logtype`
 
@@ -3550,6 +3568,7 @@ The following parameters are available in the `zabbix::resources::agent` class:
 * [`macros`](#macros)
 * [`proxy`](#proxy)
 * [`interfacetype`](#interfacetype)
+* [`interfacedetails`](#interfacedetails)
 
 ##### <a name="hostname"></a>`hostname`
 
@@ -3635,10 +3654,18 @@ Default value: ``undef``
 
 Data type: `Any`
 
-Internally used identifier for the host interface
+Internally used identifier for the host interface.
 
 Default value: `1`
 
+##### <a name="interfacedetails"></a>`interfacedetails`
+
+Data type: `Variant[Array, Hash]`
+
+Hash with interface details for SNMP when interface type is 2.
+
+Default value: `[]`
+
 ### <a name="zabbixresourcesproxy"></a>`zabbix::resources::proxy`
 
 This will create resources into puppetdb for automatically configuring proxy agent into zabbix front-end.
@@ -3852,6 +3879,8 @@ The following parameters are available in the `zabbix::server` class:
 * [`startjavapollers`](#startjavapollers)
 * [`startlldprocessors`](#startlldprocessors)
 * [`startvmwarecollectors`](#startvmwarecollectors)
+* [`startreportwriters`](#startreportwriters)
+* [`webserviceurl`](#webserviceurl)
 * [`vmwarefrequency`](#vmwarefrequency)
 * [`vaultdbpath`](#vaultdbpath)
 * [`vaulttoken`](#vaulttoken)
@@ -4324,6 +4353,22 @@ Number of pre-forked vmware collector instances.
 
 Default value: `$zabbix::params::server_startvmwarecollectors`
 
+##### <a name="startreportwriters"></a>`startreportwriters`
+
+Data type: `Optional[Integer[1, 100]]`
+
+Number of pre-forked report writer instances.
+
+Default value: ``undef``
+
+##### <a name="webserviceurl"></a>`webserviceurl`
+
+Data type: `Optional[Stdlib::HTTPUrl]`
+
+URL to Zabbix web service, used to perform web related tasks.
+
+Default value: ``undef``
+
 ##### <a name="vmwarefrequency"></a>`vmwarefrequency`
 
 Data type: `Any`
@@ -5336,6 +5381,13 @@ The following parameters are available in the `zabbix::resources::template` defi
 * [`template_name`](#template_name)
 * [`template_source`](#template_source)
 * [`zabbix_version`](#zabbix_version)
+* [`delete_missing_applications`](#delete_missing_applications)
+* [`delete_missing_drules`](#delete_missing_drules)
+* [`delete_missing_graphs`](#delete_missing_graphs)
+* [`delete_missing_httptests`](#delete_missing_httptests)
+* [`delete_missing_items`](#delete_missing_items)
+* [`delete_missing_templatescreens`](#delete_missing_templatescreens)
+* [`delete_missing_triggers`](#delete_missing_triggers)
 
 ##### <a name="template_dir"></a>`template_dir`
 
@@ -5369,6 +5421,62 @@ Zabbix version that the template will be installed on.
 
 Default value: `$zabbix::params::zabbix_version`
 
+##### <a name="delete_missing_applications"></a>`delete_missing_applications`
+
+Data type: `Boolean`
+
+Deletes applications from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_drules"></a>`delete_missing_drules`
+
+Data type: `Boolean`
+
+Deletes discovery rules from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_graphs"></a>`delete_missing_graphs`
+
+Data type: `Boolean`
+
+Deletes graphs from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_httptests"></a>`delete_missing_httptests`
+
+Data type: `Boolean`
+
+Deletes web-scenarios from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_items"></a>`delete_missing_items`
+
+Data type: `Boolean`
+
+Deletes items from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_templatescreens"></a>`delete_missing_templatescreens`
+
+Data type: `Boolean`
+
+Deletes template-screens from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_triggers"></a>`delete_missing_triggers`
+
+Data type: `Boolean`
+
+Deletes triggers from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
 ### <a name="zabbixresourcesuserparameters"></a>`zabbix::resources::userparameters`
 
 This will create resources into puppetdb for automatically configuring agent into zabbix front-end.
@@ -5475,11 +5583,11 @@ Default value: ``undef``
 
 ##### <a name="additional_service_params"></a>`additional_service_params`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Additional parameters to pass to the service
 
-Default value: `''`
+Default value: ``undef``
 
 ##### <a name="service_type"></a>`service_type`
 
@@ -5526,6 +5634,13 @@ The following parameters are available in the `zabbix::template` defined type:
 * [`templ_name`](#templ_name)
 * [`templ_source`](#templ_source)
 * [`zabbix_version`](#zabbix_version)
+* [`delete_missing_applications`](#delete_missing_applications)
+* [`delete_missing_drules`](#delete_missing_drules)
+* [`delete_missing_graphs`](#delete_missing_graphs)
+* [`delete_missing_httptests`](#delete_missing_httptests)
+* [`delete_missing_items`](#delete_missing_items)
+* [`delete_missing_templatescreens`](#delete_missing_templatescreens)
+* [`delete_missing_triggers`](#delete_missing_triggers)
 
 ##### <a name="templ_name"></a>`templ_name`
 
@@ -5551,6 +5666,62 @@ The Zabbix version on which the template will be installed on.
 
 Default value: `$zabbix::params::zabbix_version`
 
+##### <a name="delete_missing_applications"></a>`delete_missing_applications`
+
+Data type: `Boolean`
+
+Deletes applications from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_drules"></a>`delete_missing_drules`
+
+Data type: `Boolean`
+
+Deletes discovery rules from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_graphs"></a>`delete_missing_graphs`
+
+Data type: `Boolean`
+
+Deletes graphs from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_httptests"></a>`delete_missing_httptests`
+
+Data type: `Boolean`
+
+Deletes web-scenarios from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_items"></a>`delete_missing_items`
+
+Data type: `Boolean`
+
+Deletes items from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_templatescreens"></a>`delete_missing_templatescreens`
+
+Data type: `Boolean`
+
+Deletes template-screens from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
+##### <a name="delete_missing_triggers"></a>`delete_missing_triggers`
+
+Data type: `Boolean`
+
+Deletes triggers from zabbix that are not in the template when set to true
+
+Default value: ``false``
+
 ### <a name="zabbixuserparameters"></a>`zabbix::userparameters`
 
 This will install an userparameters file with keys for items that can be checked with zabbix.
@@ -5740,6 +5911,10 @@ An array of groups the host belongs to.
 
 Internally used hostid
 
+##### `interfacedetails`
+
+Additional interface details.
+
 ##### `interfaceid`
 
 Internally used identifier for the host interface
@@ -5909,11 +6084,46 @@ Default value: `present`
 
 The following parameters are available in the `zabbix_template` type.
 
+* [`delete_missing_applications`](#delete_missing_applications)
+* [`delete_missing_drules`](#delete_missing_drules)
+* [`delete_missing_graphs`](#delete_missing_graphs)
+* [`delete_missing_httptests`](#delete_missing_httptests)
+* [`delete_missing_items`](#delete_missing_items)
+* [`delete_missing_templatescreens`](#delete_missing_templatescreens)
+* [`delete_missing_triggers`](#delete_missing_triggers)
 * [`provider`](#provider)
 * [`template_name`](#template_name)
 * [`template_source`](#template_source)
 * [`zabbix_version`](#zabbix_version)
 
+##### <a name="delete_missing_applications"></a>`delete_missing_applications`
+
+Delete applications from zabbix which are not in the template.
+
+##### <a name="delete_missing_drules"></a>`delete_missing_drules`
+
+Delete discovery rules from zabbix which are not in the template.
+
+##### <a name="delete_missing_graphs"></a>`delete_missing_graphs`
+
+Delete graphs from zabbix which are not in the template.
+
+##### <a name="delete_missing_httptests"></a>`delete_missing_httptests`
+
+Delete web scenarios from zabbix which are not in the template.
+
+##### <a name="delete_missing_items"></a>`delete_missing_items`
+
+Delete items from zabbix which are not in the template.
+
+##### <a name="delete_missing_templatescreens"></a>`delete_missing_templatescreens`
+
+Delete templateScreens from zabbix which are not in the template.
+
+##### <a name="delete_missing_triggers"></a>`delete_missing_triggers`
+
+Delete triggers from zabbix which are not in the template.
+
 ##### <a name="provider"></a>`provider`
 
 The specific backend to use for this `zabbix_template` resource. You will seldom need to specify this --- Puppet will
@@ -5933,7 +6143,7 @@ Zabbix version that the template will be installed on.
 
 ### <a name="zabbix_template_host"></a>`zabbix_template_host`
 
-Link or Unlink template to host.
+Link or Unlink template to host. Only for Zabbix < 6.0!
 Example.
 Name should be in the format of "template_name@hostname"
 
@@ -5962,7 +6172,7 @@ The following parameters are available in the `zabbix_template_host` type.
 
 ##### <a name="name"></a>`name`
 
-Valid values: `%r{.+\@.+}`
+Valid values: `%r{.+@.+}`
 
 namevar
 
diff --git a/metadata.json b/metadata.json
index 09b781910..15190a89c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-zabbix",
-  "version": "9.1.1-rc0",
+  "version": "9.2.0",
   "summary": "Installing and maintaining Zabbix. Will install server, proxy, java-gateway and agent on RedHat/Debian/Ubuntu (Incl. exported resources).",
   "author": "Vox Pupuli",
   "dependencies": [