diff --git a/config_templates/agent_windows/zabbix_agentd.conf b/config_templates/agent_windows/zabbix_agentd.conf
deleted file mode 100644
index d195b9047..000000000
--- a/config_templates/agent_windows/zabbix_agentd.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a configuration file for Zabbix agent service (Windows)
-# To get more information about Zabbix, visit https://www.zabbix.com
-
-############ ADVANCED PARAMETERS #################
-
-### Option: Include
-#	You may include individual files in the configuration file.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=c:\zabbix\zabbix_agentd.userparams.conf
-# Include=c:\zabbix\zabbix_agentd.conf.d\
-# Include=c:\zabbix\zabbix_agentd.conf.d\*.conf
-
-Include=C:\zabbix\conf\zabbix_agentd_active_checks.conf
-Include=C:\zabbix\conf\zabbix_agentd_aliases.conf
-Include=C:\zabbix\conf\zabbix_agentd_item_keys.conf
-Include=C:\zabbix\conf\zabbix_agentd_logging.conf
-Include=C:\zabbix\conf\zabbix_agentd_network.conf
-Include=C:\zabbix\conf\zabbix_agentd_passive_checks.conf
-Include=C:\zabbix\conf\zabbix_agentd_perf_counters.conf
-Include=C:\zabbix\conf\zabbix_agentd_timeouts.conf
-Include=C:\zabbix\conf\zabbix_agentd_tls.conf
-Include=C:\zabbix\conf\zabbix_agentd_user_parameters.conf
-
-Include=C:\zabbix\conf\zabbix_agentd.d\*.conf
diff --git a/config_templates/agent_windows/zabbix_agentd_active_checks.conf b/config_templates/agent_windows/zabbix_agentd_active_checks.conf
deleted file mode 100644
index 939fbc4fa..000000000
--- a/config_templates/agent_windows/zabbix_agentd_active_checks.conf
+++ /dev/null
@@ -1,157 +0,0 @@
-##### Active checks related
-
-### Option: ServerActive
-#	Zabbix server/proxy address or cluster configuration to get active checks from.
-#	Server/proxy address is IP address or DNS name and optional port separated by colon.
-#	Cluster configuration is one or more server addresses separated by semicolon.
-#	Multiple Zabbix servers/clusters and Zabbix proxies can be specified, separated by comma.
-#	More than one Zabbix proxy should not be specified from each Zabbix server/cluster.
-#	If Zabbix proxy is specified then Zabbix server/cluster for that proxy should not be specified.
-#	Multiple comma-delimited addresses can be provided to use several independent Zabbix servers in parallel. Spaces are allowed.
-#	If port is not specified, default port is used.
-#	IPv6 addresses must be enclosed in square brackets if port for that host is specified.
-#	If port is not specified, square brackets for IPv6 addresses are optional.
-#	If this parameter is not specified, active checks are disabled.
-#	Example for Zabbix proxy:
-#		ServerActive=127.0.0.1:10051
-#	Example for multiple servers:
-#		ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
-#	Example for high availability:
-#		ServerActive=zabbix.cluster.node1;zabbix.cluster.node2:20051;zabbix.cluster.node3
-#	Example for high availability with two clusters and one server:
-#		ServerActive=zabbix.cluster.node1;zabbix.cluster.node2:20051,zabbix.cluster2.node1;zabbix.cluster2.node2,zabbix.domain
-#
-# Mandatory: no
-# Default:
-# ServerActive=
-
-ServerActive=${ZBX_ACTIVESERVERS}
-
-### Option: Hostname
-#	List of comma delimited unique, case sensitive hostnames.
-#	Required for active checks and must match hostnames as configured on the server.
-#	Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=${ZBX_HOSTNAME}
-
-### Option: HostnameItem
-#	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
-#	Does not support UserParameters or aliases.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-HostnameItem=${ZBX_HOSTNAMEITEM}
-
-### Option: HostMetadata
-#	Optional parameter that defines host metadata.
-#	Host metadata is used at host auto-registration process.
-#	An agent will issue an error and not start if the value is over limit of 2034 bytes.
-#	If not defined, value will be acquired from HostMetadataItem.
-#
-# Mandatory: no
-# Range: 0-2034 bytes
-# Default:
-# HostMetadata=
-
-HostMetadata=${ZBX_METADATA}
-
-### Option: HostMetadataItem
-#	Optional parameter that defines an item used for getting host metadata.
-#	Host metadata is used at host auto-registration process.
-#	During an auto-registration request an agent will log a warning message if
-#	the value returned by specified item is over limit of 65535 characters.
-#	This option is only used when HostMetadata is not defined.
-#
-# Mandatory: no
-# Default:
-# HostMetadataItem=
-
-HostMetadataItem=${ZBX_METADATAITEM}
-
-### Option: HostInterface
-#	Optional parameter that defines host interface.
-#	Host interface is used at host auto-registration process.
-#	An agent will issue an error and not start if the value is over limit of 255 characters.
-#	If not defined, value will be acquired from HostInterfaceItem.
-#
-# Mandatory: no
-# Range: 0-255 characters
-# Default:
-# HostInterface=
-
-HostInterface=${ZBX_HOSTINTERFACE}
-
-### Option: HostInterfaceItem
-#	Optional parameter that defines an item used for getting host interface.
-#	Host interface is used at host auto-registration process.
-#	During an auto-registration request an agent will log a warning message if
-#	the value returned by specified item is over limit of 255 characters.
-#	This option is only used when HostInterface is not defined.
-#
-# Mandatory: no
-# Default:
-# HostInterfaceItem=
-
-HostInterfaceItem=${ZBX_HOSTINTERFACEITEM}
-
-### Option: RefreshActiveChecks
-#	How often list of active checks is refreshed, in seconds.
-#
-# Mandatory: no
-# Range: 1-86400
-# Default:
-# RefreshActiveChecks=5
-
-RefreshActiveChecks=${ZBX_REFRESHACTIVECHECKS}
-
-### Option: BufferSend
-#	Do not keep data longer than N seconds in buffer.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# BufferSend=5
-
-BufferSend=${ZBX_BUFFERSEND}
-
-### Option: BufferSize
-#	Maximum number of values in a memory buffer. The agent will send
-#	all collected data to Zabbix Server or Proxy if the buffer is full.
-#
-# Mandatory: no
-# Range: 2-65535
-# Default:
-# BufferSize=100
-
-BufferSize=${ZBX_BUFFERSIZE}
-
-### Option: MaxLinesPerSecond
-#	Maximum number of new lines the agent will send per second to Zabbix Server
-#	or Proxy processing 'log' and 'logrt' active checks.
-#	The provided value will be overridden by the parameter 'maxlines',
-#	provided in 'log' or 'logrt' item keys.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# MaxLinesPerSecond=20
-
-MaxLinesPerSecond=${ZBX_MAXLINESPERSECOND}
-
-### Option: HeartbeatFrequency
-#	Frequency of heartbeat messages in seconds.
-#	Used for monitoring availability of active checks.
-#	0 - heartbeat messages disabled.
-#
-# Mandatory: no
-# Range: 0-3600
-# Default: 60
-# HeartbeatFrequency=
-
-HeartbeatFrequency=${ZBX_HEARTBEATFREQUENCY}
diff --git a/config_templates/agent_windows/zabbix_agentd_aliases.conf b/config_templates/agent_windows/zabbix_agentd_aliases.conf
deleted file mode 100644
index 3205405bf..000000000
--- a/config_templates/agent_windows/zabbix_agentd_aliases.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-### Option: Alias
-#	Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one.
-#	Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed.
-#	Different Alias keys may reference the same item key.
-#	For example, to retrieve paging file usage in percents from the server:
-#	Alias=pg_usage:perf_counter[\Paging File(_Total)\% Usage]
-#	Now shorthand key pg_usage may be used to retrieve data.
-#	Aliases can be used in HostMetadataItem but not in HostnameItem or PerfCounter parameters.
-#
-# Mandatory: no
-# Range:
-# Default:
diff --git a/config_templates/agent_windows/zabbix_agentd_item_keys.conf b/config_templates/agent_windows/zabbix_agentd_item_keys.conf
deleted file mode 100644
index e508eaf30..000000000
--- a/config_templates/agent_windows/zabbix_agentd_item_keys.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-### Option: AllowKey
-#	Allow execution of item keys matching pattern.
-#	Multiple keys matching rules may be defined in combination with DenyKey.
-#	Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments.
-#	Parameters are processed one by one according their appearance order.
-#	If no AllowKey or DenyKey rules defined, all keys are allowed.
-#
-# Mandatory: no
-
-### Option: DenyKey
-#	Deny execution of items keys matching pattern.
-#	Multiple keys matching rules may be defined in combination with AllowKey.
-#	Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments.
-#	Parameters are processed one by one according their appearance order.
-#	If no AllowKey or DenyKey rules defined, all keys are allowed.
-#       Unless another system.run[*] rule is specified DenyKey=system.run[*] is added by default.
-#
-# Mandatory: no
-# Default:
-# DenyKey=system.run[*]
diff --git a/config_templates/agent_windows/zabbix_agentd_logging.conf b/config_templates/agent_windows/zabbix_agentd_logging.conf
deleted file mode 100644
index 1e168e890..000000000
--- a/config_templates/agent_windows/zabbix_agentd_logging.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-### Option: LogType
-#	Specifies where log messages are written to:
-#		system  - syslog
-#		file    - file specified with LogFile parameter
-#		console - standard output
-#
-# Mandatory: no
-# Default:
-# LogType=file
-
-LogType=console
-
-### Option: DebugLevel
-#	Specifies debug level:
-#	0 - basic information about starting and stopping of Zabbix processes
-#	1 - critical information
-#	2 - error information
-#	3 - warnings
-#	4 - for debugging (produces lots of information)
-#	5 - extended debugging (produces even more information)
-#
-# Mandatory: no
-# Range: 0-5
-# Default:
-# DebugLevel=3
-
-DebugLevel=${ZBX_DEBUGLEVEL}
-
-### Option: LogRemoteCommands
-#	Enable logging of executed shell commands as warnings.
-#	0 - disabled
-#	1 - enabled
-#
-# Mandatory: no
-# Default:
-# LogRemoteCommands=0
-
-LogRemoteCommands=${ZBX_LOGREMOTECOMMANDS}
diff --git a/config_templates/agent_windows/zabbix_agentd_network.conf b/config_templates/agent_windows/zabbix_agentd_network.conf
deleted file mode 100644
index 441477ba7..000000000
--- a/config_templates/agent_windows/zabbix_agentd_network.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-### Option: ListenPort
-#	Agent will listen on this port for connections from the server.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10050
-
-ListenPort=${ZBX_LISTENPORT}
-
-### Option: ListenIP
-#	List of comma delimited IP addresses that the agent should listen on.
-#	First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-ListenIP=${ZBX_LISTENIP}
-
-### Option: SourceIP
-#	Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-SourceIP=${ZBX_SOURCEIP}
-
-####### For advanced users - TCP-related fine-tuning parameters #######
-
-## Option: ListenBacklog
-#       The maximum number of pending connections in the queue. This parameter is passed to
-#       listen() function as argument 'backlog' (see "man listen").
-#
-# Mandatory: no
-# Range: 0 - INT_MAX (depends on system, too large values may be silently truncated to implementation-specified maximum)
-# Default: SOMAXCONN (hard-coded constant, depends on system)
-# ListenBacklog=
-
-ListenBacklog=${ZBX_LISTENBACKLOG}
diff --git a/config_templates/agent_windows/zabbix_agentd_passive_checks.conf b/config_templates/agent_windows/zabbix_agentd_passive_checks.conf
deleted file mode 100644
index 0e618c524..000000000
--- a/config_templates/agent_windows/zabbix_agentd_passive_checks.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-##### Passive checks related
-
-### Option: Server
-#	List of comma delimited IP addresses, optionally in CIDR notation, or DNS names of Zabbix servers and Zabbix proxies.
-#	Incoming connections will be accepted only from the hosts listed here.
-#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally
-#	and '::/0' will allow any IPv4 or IPv6 address.
-#	'0.0.0.0/0' can be used to allow any IPv4 address.
-#	Example: Server=127.0.0.1,192.168.1.0/24,::1,2001:db8::/32,zabbix.example.com
-#
-# Mandatory: yes, if StartAgents is not explicitly set to 0
-# Default:
-# Server=
-
-Server=${ZBX_PASSIVESERVERS}
-
-### Option: StartAgents
-#	Number of pre-forked instances of zabbix_agentd that process passive checks.
-#	If set to 0, disables passive checks and the agent will not listen on any TCP port.
-#
-# Mandatory: no
-# Range: 0-100
-# Default:
-# StartAgents=10
-
-StartAgents=${ZBX_STARTAGENTS}
diff --git a/config_templates/agent_windows/zabbix_agentd_perf_counters.conf b/config_templates/agent_windows/zabbix_agentd_perf_counters.conf
deleted file mode 100644
index d2757e3ec..000000000
--- a/config_templates/agent_windows/zabbix_agentd_perf_counters.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-### Option: PerfCounter
-#	Syntax: <parameter_name>,"<perf_counter_path>",<period>
-#	Defines new parameter <parameter_name> which is an average value for system performance counter <perf_counter_path> for the specified time period <period> (in seconds).
-#	For example, if you wish to receive average number of processor interrupts per second for last minute, you can define new parameter "interrupts" as following:
-#	PerfCounter = interrupts,"\Processor(0)\Interrupts/sec",60
-#	Please note double quotes around performance counter path.
-#	Samples for calculating average value will be taken every second.
-#	You may run "typeperf -qx" to get list of all performance counters available in Windows.
-#
-# Mandatory: no
-# Range:
-# Default:
diff --git a/config_templates/agent_windows/zabbix_agentd_timeouts.conf b/config_templates/agent_windows/zabbix_agentd_timeouts.conf
deleted file mode 100644
index d50cf2d75..000000000
--- a/config_templates/agent_windows/zabbix_agentd_timeouts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-### Option: Timeout
-#	Specifies how long to wait (in seconds) for establishing connection and exchanging data with Zabbix proxy or server.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-Timeout=${ZBX_TIMEOUT}
diff --git a/config_templates/agent_windows/zabbix_agentd_tls.conf b/config_templates/agent_windows/zabbix_agentd_tls.conf
deleted file mode 100644
index c4e59b803..000000000
--- a/config_templates/agent_windows/zabbix_agentd_tls.conf
+++ /dev/null
@@ -1,178 +0,0 @@
-####### TLS-RELATED PARAMETERS #######
-
-### Option: TLSConnect
-#	How the agent should connect to server or proxy. Used for active checks.
-#	Only one value can be specified:
-#		unencrypted - connect without encryption
-#		psk         - connect using TLS and a pre-shared key
-#		cert        - connect using TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSConnect=unencrypted
-
-TLSConnect=${ZBX_TLSCONNECT}
-
-### Option: TLSAccept
-#	What incoming connections to accept.
-#	Multiple values can be specified, separated by comma:
-#		unencrypted - accept connections without encryption
-#		psk         - accept connections secured with TLS and a pre-shared key
-#		cert        - accept connections secured with TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSAccept=unencrypted
-
-TLSAccept=${ZBX_TLSACCEPT}
-
-### Option: TLSCAFile
-#	Full pathname of a file containing the top-level CA(s) certificates for
-#	peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# TLSCAFile=
-
-TLSCAFile=${ZBX_TLSCAFILE}
-
-### Option: TLSCRLFile
-#	Full pathname of a file containing revoked certificates.
-#
-# Mandatory: no
-# Default:
-# TLSCRLFile=
-
-TLSCRLFile=${ZBX_TLSCRLFILE}
-
-### Option: TLSServerCertIssuer
-#		Allowed server certificate issuer.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertIssuer=
-
-TLSServerCertIssuer=${ZBX_TLSSERVERCERTISSUER}
-
-### Option: TLSServerCertSubject
-#		Allowed server certificate subject.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertSubject=
-
-TLSServerCertSubject=${ZBX_TLSSERVERCERTSUBJECT}
-
-### Option: TLSCertFile
-#	Full pathname of a file containing the agent certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# TLSCertFile=
-
-TLSCertFile=${ZBX_TLSCERTFILE}
-
-### Option: TLSKeyFile
-#	Full pathname of a file containing the agent private key.
-#
-# Mandatory: no
-# Default:
-# TLSKeyFile=
-
-TLSKeyFile=${ZBX_TLSKEYFILE}
-
-### Option: TLSPSKIdentity
-#	Unique, case sensitive string used to identify the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKIdentity=
-
-TLSPSKIdentity=${ZBX_TLSPSKIDENTITY}
-
-### Option: TLSPSKFile
-#	Full pathname of a file containing the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKFile=
-
-TLSPSKFile=${ZBX_TLSPSKFILE}
-
-####### For advanced users - TLS ciphersuite selection criteria #######
-
-### Option: TLSCipherCert13
-#	Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
-#	Override the default ciphersuite selection criteria for certificate-based encryption.
-#
-# Mandatory: no
-# Default:
-# TLSCipherCert13=
-
-TLSCipherCert13=${ZBX_TLSCIPHERCERT13}
-
-### Option: TLSCipherCert
-#	GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
-#	Override the default ciphersuite selection criteria for certificate-based encryption.
-#	Example for GnuTLS:
-#		NONE:+VERS-TLS1.2:+ECDHE-RSA:+RSA:+AES-128-GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-ALL:+COMP-NULL:+SIGN-ALL:+CTYPE-X.509
-#	Example for OpenSSL:
-#		EECDH+aRSA+AES128:RSA+aRSA+AES128
-#
-# Mandatory: no
-# Default:
-# TLSCipherCert=
-
-TLSCipherCert=${ZBX_TLSCIPHERCERT}
-
-### Option: TLSCipherPSK13
-#	Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
-#	Override the default ciphersuite selection criteria for PSK-based encryption.
-#	Example:
-#		TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256
-#
-# Mandatory: no
-# Default:
-# TLSCipherPSK13=
-
-TLSCipherPSK13=${ZBX_TLSCIPHERPSK13}
-
-### Option: TLSCipherPSK
-#	GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
-#	Override the default ciphersuite selection criteria for PSK-based encryption.
-#	Example for GnuTLS:
-#		NONE:+VERS-TLS1.2:+ECDHE-PSK:+PSK:+AES-128-GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-ALL:+COMP-NULL:+SIGN-ALL
-#	Example for OpenSSL:
-#		kECDHEPSK+AES128:kPSK+AES128
-#
-# Mandatory: no
-# Default:
-# TLSCipherPSK=
-
-TLSCipherPSK=${ZBX_TLSCIPHERPSK}
-
-### Option: TLSCipherAll13
-#	Cipher string for OpenSSL 1.1.1 or newer in TLS 1.3.
-#	Override the default ciphersuite selection criteria for certificate- and PSK-based encryption.
-#	Example:
-#		TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256
-#
-# Mandatory: no
-# Default:
-# TLSCipherAll13=
-
-TLSCipherAll13=${ZBX_TLSCIPHERALL13}
-
-### Option: TLSCipherAll
-#	GnuTLS priority string or OpenSSL (TLS 1.2) cipher string.
-#	Override the default ciphersuite selection criteria for certificate- and PSK-based encryption.
-#	Example for GnuTLS:
-#		NONE:+VERS-TLS1.2:+ECDHE-RSA:+RSA:+ECDHE-PSK:+PSK:+AES-128-GCM:+AES-128-CBC:+AEAD:+SHA256:+SHA1:+CURVE-ALL:+COMP-NULL:+SIGN-ALL:+CTYPE-X.509
-#	Example for OpenSSL:
-#		EECDH+aRSA+AES128:RSA+aRSA+AES128:kECDHEPSK+AES128:kPSK+AES128
-#
-# Mandatory: no
-# Default:
-# TLSCipherAll=
-
-TLSCipherAll=${ZBX_TLSCIPHERALL}
diff --git a/config_templates/agent_windows/zabbix_agentd_user_parameters.conf b/config_templates/agent_windows/zabbix_agentd_user_parameters.conf
deleted file mode 100644
index fd664958c..000000000
--- a/config_templates/agent_windows/zabbix_agentd_user_parameters.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-#	Allow all characters to be passed in arguments to user-defined parameters.
-#	The following characters are not allowed:
-#	\ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @
-#	Additionally, newline characters are not allowed.
-#	0 - do not allow
-#	1 - allow
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# UnsafeUserParameters=0
-
-UnsafeUserParameters=${ZBX_UNSAFEUSERPARAMETERS}
-
-### Option: UserParameter
-#	User-defined parameter to monitor. There can be several user-defined parameters.
-#	Format: UserParameter=<key>,<shell command>
-#	See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-### Option: UserParameterDir
-#	Directory to execute UserParameter commands from. Only one entry is allowed.
-#	When executing UserParameter commands the agent will change the working directory to the one
-#	specified in the UserParameterDir option.
-#	This way UserParameter commands can be specified using the relative ./ prefix.
-#
-# Mandatory: no
-# Default:
-# UserParameterDir=