diff --git a/sysutils/beats93/Makefile b/sysutils/beats93/Makefile
index 17c9c80a67ea..82f0304495e2 100644
--- a/sysutils/beats93/Makefile
+++ b/sysutils/beats93/Makefile
@@ -1,143 +1,143 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.2.6
+DISTVERSION=	9.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
-PKGNAMESUFFIX=	92
+PKGNAMESUFFIX=	93
 DISTFILES=	go.mod:gomod
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Send logs, network, metrics and heartbeat to Elasticsearch or Logstash (${DISTVERSION:R}.x version)
 WWW=		https://www.elastic.co/products/beats/
 
 LICENSE=	APACHE20
 
 USES=		go:modules
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	elastic
 
 USE_RC_SUBR=	${GO_TARGET:S,./,,g}
 
 GO_MODULE=	github.com/elastic/beats/v7
 CGO_CFLAGS=	-I.
 CGO_LDFLAGS=	-L.
 MAKE_ENV=	GOBUILD_FLAGS="-mod=vendor"
 
-CONFLICTS=	${PORTNAME}8 ${PORTNAME}91 ${PORTNAME}93
+CONFLICTS=	${PORTNAME}8 ${PORTNAME}91 ${PORTNAME}92
 
-PORTSCOUT=	limit:^9\.2\.
+PORTSCOUT=	limit:^9\.3\.
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 .ifmake makesum || makeplist || distclean
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .else
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
 .endif
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
 PACKETBEAT_DESC=		Packetbeat
 AUDITBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/auditbeat/:auditbeat \
 				${LOCAL_MASTER_SITES:S|$|:auditbeat|}
 AUDITBEAT_DISTFILES=		auditbeat-${DISTVERSION}-darwin-x86_64.tar.gz:auditbeat
 AUDITBEAT_VARS=			GO_TARGET+=./auditbeat
 FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat \
 				${LOCAL_MASTER_SITES:S|$|:filebeat|}
 FILEBEAT_DISTFILES=		filebeat-${DISTVERSION}-darwin-x86_64.tar.gz:filebeat
 FILEBEAT_VARS=			GO_TARGET+=./filebeat
 HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat \
 				${LOCAL_MASTER_SITES:S|$|:heartbeat|}
 HEARTBEAT_DISTFILES=		heartbeat-${DISTVERSION}-darwin-x86_64.tar.gz:heartbeat
 HEARTBEAT_VARS=			GO_TARGET+=./heartbeat
 METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat \
 				${LOCAL_MASTER_SITES:S|$|:metricbeat|}
 METRICBEAT_DISTFILES=		metricbeat-${DISTVERSION}-darwin-x86_64.tar.gz:metricbeat
 METRICBEAT_VARS=		GO_TARGET+=./metricbeat
 PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat \
 				${LOCAL_MASTER_SITES:S|$|:packetbeat|}
 PACKETBEAT_DISTFILES=		packetbeat-${DISTVERSION}-darwin-x86_64.tar.gz:packetbeat
 PACKETBEAT_VARS=		CGO_CFLAGS+=-I/usr/include \
 				CGO_LDFLAGS+=-L/usr/lib \
 				GO_TARGET+=./packetbeat
 
 LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/${BEATMOD}/*.yml
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
 	(${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD} && \
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/${BEATMOD} \
 		${STAGEDIR}${PREFIX}/sbin && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference)
 	(MODULE_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/module; \
 	 if [ -d $${MODULE_SRC} ]; then \
 	   MODULE_DEST=${STAGEDIR}${DATADIR}/${BEATMOD}/module && \
 	   ${MKDIR} $${MODULE_DEST} && \
 	   cd $${MODULE_SRC} && ${COPYTREE_SHARE} . $${MODULE_DEST} && \
 	   cd $${MODULE_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST}; \
 	 fi) && \
 	(MODULESD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/modules.d; \
 	 if [ -d $${MODULESD_SRC} ]; then \
 	   MODULESD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.modules.d && \
 	   ${MKDIR} $${MODULESD_DEST} && \
 	   cd $${MODULESD_SRC} && ${COPYTREE_SHARE} . $${MODULESD_DEST} && \
 	   cd $${MODULESD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d && \
 	   ${ECHO_CMD} "The modules.d files are now in ${EXAMPLESDIR}/${BEATMOD}.modules.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.modules.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(MONITORSD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/monitors.d; \
 	 if [ -d $${MONITORSD_SRC} ]; then \
 	   MONITORSD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.monitors.d && \
 	   ${MKDIR} $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_SRC} && ${COPYTREE_SHARE} . $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d && \
 	   ${ECHO_CMD} "The monitors.d files are now in ${EXAMPLESDIR}/${BEATMOD}.monitors.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.monitors.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(KIBANA_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/kibana; \
 	 if [ -d $${KIBANA_SRC} ]; then \
 	   KIBANA_PATH=${STAGEDIR}${DATADIR}/${BEATMOD}/kibana; \
 	   ${MKDIR} $${KIBANA_PATH} && \
 	   cd $${KIBANA_SRC} && ${COPYTREE_SHARE} . $${KIBANA_PATH}; \
 	   cd $${KIBANA_PATH} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	 fi)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/beats93/distinfo b/sysutils/beats93/distinfo
index bfbd5f394b01..cf19d79d14cf 100644
--- a/sysutils/beats93/distinfo
+++ b/sysutils/beats93/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1773063839
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/go.mod) = 0e54bdc28d645d02707ac2318ab6dec29a38411e28a24c051b9c4e0d7f894f7d
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/go.mod) = 28752
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/auditbeat-9.2.6-darwin-x86_64.tar.gz) = ef48556434b6e05dfd78d3b136856d9146c1d5032ba3e28e6884aad0c1248b8e
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/auditbeat-9.2.6-darwin-x86_64.tar.gz) = 35965848
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/filebeat-9.2.6-darwin-x86_64.tar.gz) = bf52f26fbe486b3006433c330dd7d28a6b70f368d605b8553bc5df6dd904bdba
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/filebeat-9.2.6-darwin-x86_64.tar.gz) = 55871418
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/heartbeat-9.2.6-darwin-x86_64.tar.gz) = 8f3f472f03e5e1458ae32b8cdf29b8d6b7eb242abb20128f0639e0c05890cc84
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/heartbeat-9.2.6-darwin-x86_64.tar.gz) = 35733230
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/metricbeat-9.2.6-darwin-x86_64.tar.gz) = 4c4410d7c7ae83357cf22418cfe6b7a308bd03ae0eb72636c09df878ce1af864
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/metricbeat-9.2.6-darwin-x86_64.tar.gz) = 60072220
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/packetbeat-9.2.6-darwin-x86_64.tar.gz) = b4dce964df3caa0467cb6ca7204acbf5dd0e48cf8c5c64aafb2caace0bb11958
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/packetbeat-9.2.6-darwin-x86_64.tar.gz) = 36954184
-SHA256 (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/elastic-beats-v9.2.6_GH0.tar.gz) = 11a9b4715bc88f312e6b6ce324fb5cfe1b9d4d1fc76d70cbd610fbe142f847dc
-SIZE (go/sysutils_beats92/elastic-beats-v9.2.6_GH0/elastic-beats-v9.2.6_GH0.tar.gz) = 99881282
+TIMESTAMP = 1773064124
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/go.mod) = 12a772a95a1c7e8a86e5cef7bac4ffcaf86ba08a7f5c741fa748b63f728d12cb
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/go.mod) = 28847
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/auditbeat-9.3.1-darwin-x86_64.tar.gz) = 133f19872c11515d77b24208ce61716a0e09d206aa6ff088e6b916de57cc7bdf
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/auditbeat-9.3.1-darwin-x86_64.tar.gz) = 35978516
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/filebeat-9.3.1-darwin-x86_64.tar.gz) = 9d1f0af9ab8ce78525496506adea24688744f8ad91eee063dc48e7763e05bcac
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/filebeat-9.3.1-darwin-x86_64.tar.gz) = 56132282
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/heartbeat-9.3.1-darwin-x86_64.tar.gz) = 60e5169dc1d5454faf3d5ca3b72b401255acb5a07f237ec18ed8b1b189ead94d
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/heartbeat-9.3.1-darwin-x86_64.tar.gz) = 35745443
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/metricbeat-9.3.1-darwin-x86_64.tar.gz) = e8885267e1c9229e87dd4a0f81afe06bd99e2fbef1131a8914a243457d8e1172
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/metricbeat-9.3.1-darwin-x86_64.tar.gz) = 60065375
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/packetbeat-9.3.1-darwin-x86_64.tar.gz) = bc243e9cfac4c3f9e9ed2ca33eab94307f2e1b26567c538459f832cd000940ae
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/packetbeat-9.3.1-darwin-x86_64.tar.gz) = 36978599
+SHA256 (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/elastic-beats-v9.3.1_GH0.tar.gz) = 77851327be677219aa116531e8d37c6359d59aff9ab6feff9e5f3d570a54a221
+SIZE (go/sysutils_beats93/elastic-beats-v9.3.1_GH0/elastic-beats-v9.3.1_GH0.tar.gz) = 104227700
diff --git a/sysutils/beats93/files/patch-auditbeat_auditbeat.reference.yml b/sysutils/beats93/files/patch-auditbeat_auditbeat.reference.yml
index 9faffa230c50..13dc7dceefa4 100644
--- a/sysutils/beats93/files/patch-auditbeat_auditbeat.reference.yml
+++ b/sysutils/beats93/files/patch-auditbeat_auditbeat.reference.yml
@@ -1,20 +1,20 @@
---- auditbeat/auditbeat.reference.yml.orig	2026-02-23 21:59:03 UTC
+--- auditbeat/auditbeat.reference.yml.orig	2026-02-23 21:59:26 UTC
 +++ auditbeat/auditbeat.reference.yml
 @@ -14,7 +14,7 @@ auditbeat.config.modules:
  auditbeat.config.modules:
  
    # Glob pattern for configuration reloading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/auditbeat.modules.d/*.yml
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
 @@ -1250,7 +1250,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/auditbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats93/files/patch-auditbeat_auditbeat.yml b/sysutils/beats93/files/patch-auditbeat_auditbeat.yml
index 2fa50796cbb3..ee2052ae5b40 100644
--- a/sysutils/beats93/files/patch-auditbeat_auditbeat.yml
+++ b/sysutils/beats93/files/patch-auditbeat_auditbeat.yml
@@ -1,13 +1,13 @@
---- auditbeat/auditbeat.yml.orig	2026-02-23 21:59:03 UTC
+--- auditbeat/auditbeat.yml.orig	2026-02-23 21:59:26 UTC
 +++ auditbeat/auditbeat.yml
 @@ -82,6 +82,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/auditbeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
diff --git a/sysutils/beats93/files/patch-dev-tools_mage_settings.go b/sysutils/beats93/files/patch-dev-tools_mage_settings.go
index 29910d5e1825..4e23ea1aa6f2 100644
--- a/sysutils/beats93/files/patch-dev-tools_mage_settings.go
+++ b/sysutils/beats93/files/patch-dev-tools_mage_settings.go
@@ -1,20 +1,20 @@
---- dev-tools/mage/settings.go.orig	2026-02-23 21:59:03 UTC
+--- dev-tools/mage/settings.go.orig	2026-02-23 21:59:26 UTC
 +++ dev-tools/mage/settings.go
 @@ -31,7 +31,6 @@ import (
  	"sync"
  	"time"
  
 -	"github.com/magefile/mage/sh"
  	"golang.org/x/text/cases"
  	"golang.org/x/text/language"
  	"gopkg.in/yaml.v3"
 @@ -282,7 +281,8 @@ func CommitHash() (string, error) {
  func CommitHash() (string, error) {
  	var err error
  	commitHashOnce.Do(func() {
 -		commitHash, err = sh.Output("git", "rev-parse", "HEAD")
 +		err = nil
 +		commitHash = "%%BEATSVERSION%%"
  	})
  	return commitHash, err
  }
diff --git a/sysutils/beats93/files/patch-filebeat_filebeat.reference.yml b/sysutils/beats93/files/patch-filebeat_filebeat.reference.yml
index d7f0e29392d0..264dee0be250 100644
--- a/sysutils/beats93/files/patch-filebeat_filebeat.reference.yml
+++ b/sysutils/beats93/files/patch-filebeat_filebeat.reference.yml
@@ -1,26 +1,26 @@
---- filebeat/filebeat.reference.yml.orig	2026-02-23 21:59:03 UTC
+--- filebeat/filebeat.reference.yml.orig	2026-02-23 21:59:26 UTC
 +++ filebeat/filebeat.reference.yml
-@@ -1369,12 +1369,12 @@ - type: filestream
+@@ -1384,12 +1384,12 @@ - type: filestream
  #filebeat.config:
    #inputs:
      #enabled: false
 -    #path: inputs.d/*.yml
 +    #path: filebeat.inputs.d/*.yml
      #reload.enabled: true
      #reload.period: 10s
    #modules:
      #enabled: true
 -    #path: modules.d/*.yml
 +    #path: filebeat.modules.d/*.yml
      #reload.enabled: true
      #reload.period: 10s
  
-@@ -2448,7 +2448,7 @@ output.elasticsearch:
+@@ -2463,7 +2463,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/filebeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats93/files/patch-filebeat_filebeat.yml b/sysutils/beats93/files/patch-filebeat_filebeat.yml
index c90dd3352ef7..8da25911b8d9 100644
--- a/sysutils/beats93/files/patch-filebeat_filebeat.yml
+++ b/sysutils/beats93/files/patch-filebeat_filebeat.yml
@@ -1,33 +1,33 @@
---- filebeat/filebeat.yml.orig	2026-02-23 21:59:03 UTC
+--- filebeat/filebeat.yml.orig	2026-02-23 21:59:26 UTC
 +++ filebeat/filebeat.yml
 @@ -81,7 +81,7 @@ filebeat.config.modules:
  
  filebeat.config.modules:
    # Glob pattern for configuration loading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/filebeat.modules.d/*.yml
  
    # Set to true to enable config reloading
    reload.enabled: false
 @@ -124,6 +124,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/filebeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
 @@ -195,8 +199,8 @@ processors:
    - add_host_metadata:
        when.not.contains.tags: forwarded
    - add_cloud_metadata: ~
 -  - add_docker_metadata: ~
 -  - add_kubernetes_metadata: ~
 +#  - add_docker_metadata: ~
 +#  - add_kubernetes_metadata: ~
  
  # ================================== Logging ===================================
  
diff --git a/sysutils/beats93/files/patch-heartbeat_heartbeat.yml b/sysutils/beats93/files/patch-heartbeat_heartbeat.yml
index c02cd2a27389..78bab8dc4f9a 100644
--- a/sysutils/beats93/files/patch-heartbeat_heartbeat.yml
+++ b/sysutils/beats93/files/patch-heartbeat_heartbeat.yml
@@ -1,11 +1,11 @@
---- heartbeat/heartbeat.yml.orig	2026-02-23 21:59:03 UTC
+--- heartbeat/heartbeat.yml.orig	2026-02-23 21:59:26 UTC
 +++ heartbeat/heartbeat.yml
 @@ -13,7 +13,7 @@ heartbeat.config.monitors:
  # of individual yaml files.
  heartbeat.config.monitors:
    # Directory + glob pattern to search for configuration files
 -  path: ${path.config}/monitors.d/*.yml
 +  path: ${path.config}/heartbeat.monitors.d/*.yml
    # If enabled, heartbeat will periodically check the config.monitors path for changes
    reload.enabled: false
    # How often to check for changes
diff --git a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_config.go b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_config.go
index 2c0b9bb69121..ebd3c6ae0942 100644
--- a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_config.go
+++ b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_config.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/docker/config.go.orig	2026-02-23 21:59:03 UTC
+--- libbeat/autodiscover/providers/docker/config.go.orig	2026-02-23 21:59:26 UTC
 +++ libbeat/autodiscover/providers/docker/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package docker
  
diff --git a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_docker.go b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_docker.go
index 11f51af2fcee..742bfc1be1c7 100644
--- a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_docker.go
+++ b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_docker_docker.go
@@ -1,20 +1,20 @@
---- libbeat/autodiscover/providers/docker/docker.go.orig	2026-02-23 21:59:03 UTC
+--- libbeat/autodiscover/providers/docker/docker.go.orig	2026-02-23 21:59:26 UTC
 +++ libbeat/autodiscover/providers/docker/docker.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package docker
  
 @@ -32,7 +32,7 @@ import (
  	"github.com/elastic/beats/v7/libbeat/common"
  
  	"github.com/elastic/elastic-agent-autodiscover/bus"
 -	"github.com/elastic/elastic-agent-autodiscover/docker"
 +	docker "github.com/elastic/elastic-agent-autodiscover/docker"
  	"github.com/elastic/elastic-agent-autodiscover/utils"
  	"github.com/elastic/elastic-agent-libs/config"
  	"github.com/elastic/elastic-agent-libs/keystore"
diff --git a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_config.go b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
index 31f669b6f142..8c19d9aa2fec 100644
--- a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
+++ b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/kubernetes/config.go.orig	2026-02-23 21:59:03 UTC
+--- libbeat/autodiscover/providers/kubernetes/config.go.orig	2026-02-23 21:59:26 UTC
 +++ libbeat/autodiscover/providers/kubernetes/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package kubernetes
  
diff --git a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
index a0a69073c24b..6b7c90fc4e73 100644
--- a/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
+++ b/sysutils/beats93/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2026-02-23 21:59:03 UTC
+--- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2026-02-23 21:59:26 UTC
 +++ libbeat/autodiscover/providers/kubernetes/kubernetes.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package kubernetes
  
diff --git a/sysutils/beats93/files/patch-libbeat_scripts_Makefile b/sysutils/beats93/files/patch-libbeat_scripts_Makefile
index 8bf9d444356a..a84103ea085d 100644
--- a/sysutils/beats93/files/patch-libbeat_scripts_Makefile
+++ b/sysutils/beats93/files/patch-libbeat_scripts_Makefile
@@ -1,26 +1,26 @@
---- libbeat/scripts/Makefile.orig	2026-02-23 21:59:03 UTC
+--- libbeat/scripts/Makefile.orig	2026-02-23 21:59:26 UTC
 +++ libbeat/scripts/Makefile
 @@ -47,7 +47,7 @@ GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name
  GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
  GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go' 2>/dev/null)
  GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name "stress" \) 2>/dev/null)
 -SHELL=bash
 +SHELL=sh
  ES_HOST?=elasticsearch
  ES_PORT?=9200
  ES_USER?=beats
-@@ -346,12 +346,12 @@ update: python-env fields collect config ## @build Upd
+@@ -336,12 +336,12 @@ update: python-env fields collect config ## @build Upd
  update: python-env fields collect config ## @build Update expects the most recent version of libbeat in the GOPATH
  	@echo "Updating generated files for ${BEAT_NAME}"
  
 -ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
 +ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
  	mkdir -p include
  	go run ${INSTALL_FLAG} ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license $(LICENSE) -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
  endif
  
 -ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
 +ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
  	@# Update docs
  	@mkdir -p docs
  	@${PYTHON_ENV_EXE} ${ES_BEATS}/libbeat/scripts/generate_fields_docs.py $(PWD)/fields.yml ${BEAT_NAME} ${ES_BEATS} --output_path $(ES_BEATS)/docs/reference/${BEAT_NAME}
diff --git a/sysutils/beats93/files/patch-metricbeat_metricbeat.reference.yml b/sysutils/beats93/files/patch-metricbeat_metricbeat.reference.yml
index 7ed95de26254..c1313fe019b0 100644
--- a/sysutils/beats93/files/patch-metricbeat_metricbeat.reference.yml
+++ b/sysutils/beats93/files/patch-metricbeat_metricbeat.reference.yml
@@ -1,20 +1,20 @@
---- metricbeat/metricbeat.reference.yml.orig	2026-02-23 21:59:03 UTC
+--- metricbeat/metricbeat.reference.yml.orig	2026-02-23 21:59:26 UTC
 +++ metricbeat/metricbeat.reference.yml
 @@ -14,7 +14,7 @@ metricbeat.config.modules:
  metricbeat.config.modules:
  
    # Glob pattern for configuration reloading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/metricbeat.modules.d/*.yml
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
 @@ -2218,7 +2218,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/metricbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats93/files/patch-metricbeat_metricbeat.yml b/sysutils/beats93/files/patch-metricbeat_metricbeat.yml
index 7b197f8aa162..7c86bbed406e 100644
--- a/sysutils/beats93/files/patch-metricbeat_metricbeat.yml
+++ b/sysutils/beats93/files/patch-metricbeat_metricbeat.yml
@@ -1,33 +1,33 @@
---- metricbeat/metricbeat.yml.orig	2026-02-23 21:59:03 UTC
+--- metricbeat/metricbeat.yml.orig	2026-02-23 21:59:26 UTC
 +++ metricbeat/metricbeat.yml
 @@ -11,7 +11,7 @@ metricbeat.config.modules:
  
  metricbeat.config.modules:
    # Glob pattern for configuration loading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/metricbeat.modules.d/*.yml
  
    # Set to true to enable config reloading
    reload.enabled: false
 @@ -54,6 +54,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/metricbeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
 @@ -127,8 +131,8 @@ processors:
  processors:
    - add_host_metadata: ~
    - add_cloud_metadata: ~
 -  - add_docker_metadata: ~
 -  - add_kubernetes_metadata: ~
 +#  - add_docker_metadata: ~
 +#  - add_kubernetes_metadata: ~
  
  
  # ================================== Logging ===================================
diff --git a/sysutils/beats93/files/patch-packetbeat_packetbeat.reference.yml b/sysutils/beats93/files/patch-packetbeat_packetbeat.reference.yml
index f2effe3947c4..c4e04917c7c1 100644
--- a/sysutils/beats93/files/patch-packetbeat_packetbeat.reference.yml
+++ b/sysutils/beats93/files/patch-packetbeat_packetbeat.reference.yml
@@ -1,11 +1,11 @@
---- packetbeat/packetbeat.reference.yml.orig	2026-02-23 21:59:03 UTC
+--- packetbeat/packetbeat.reference.yml.orig	2026-02-23 21:59:26 UTC
 +++ packetbeat/packetbeat.reference.yml
 @@ -1718,7 +1718,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/packetbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats93/files/patch-packetbeat_packetbeat.yml b/sysutils/beats93/files/patch-packetbeat_packetbeat.yml
index a4175fbca49e..2490eefacc00 100644
--- a/sysutils/beats93/files/patch-packetbeat_packetbeat.yml
+++ b/sysutils/beats93/files/patch-packetbeat_packetbeat.yml
@@ -1,23 +1,23 @@
---- packetbeat/packetbeat.yml.orig	2026-02-23 21:59:03 UTC
+--- packetbeat/packetbeat.yml.orig	2026-02-23 21:59:26 UTC
 +++ packetbeat/packetbeat.yml
 @@ -25,7 +25,8 @@
  #   internal_networks:
  #   - private
  #
 -packetbeat.interfaces.device: any
 +# On FreeBSD, you must specify particular interface to sniff on
 +packetbeat.interfaces.device: em0
  
  # Specify the amount of time between polling for changes in the default
  # route. This option is only used when one of the default route devices
 @@ -173,6 +174,10 @@ setup.template.settings:
  # versions, this URL points to the dashboard archive on the artifacts.elastic.co
  # website.
  #setup.dashboards.url:
 +
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/packetbeat/kibana
  
  # =================================== Kibana ===================================
  
diff --git a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
index 631fbad9f7f2..c2e25aab9f45 100644
--- a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
+++ b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
@@ -1,13 +1,13 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go.orig	2026-03-16 23:13:35 UTC
+--- vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go.orig	2026-03-16 23:39:27 UTC
 +++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go
 @@ -15,8 +15,8 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 -// +build linux darwin windows
 +//go:build linux || darwin || windows || freebsd
 +// +build linux darwin windows freebsd
  
  package docker
  
diff --git a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
index ce5bc326f8bb..6797930ceb36 100644
--- a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
+++ b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
@@ -1,13 +1,13 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go.orig	2026-03-16 23:13:35 UTC
+--- vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go.orig	2026-03-16 23:39:27 UTC
 +++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go
 @@ -15,8 +15,8 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 -// +build linux darwin windows
 +//go:build linux || darwin || windows || freebsd
 +// +build linux darwin windows freebsd
  
  package docker
  
diff --git a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
index b257b1f7f95f..90f331ec5129 100644
--- a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
+++ b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
@@ -1,10 +1,10 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2026-03-16 23:13:36 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2026-03-16 23:39:28 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go
 @@ -56,3 +56,7 @@ func parseCPULine(line string) (CPU, error) {
  
  	return cpuData, errors.Join(errs...)
  }
 +
 +func scanCPUInfoFile(scanner *bufio.Scanner) ([]CPUInfo, error) {
 +	return cpuinfoScanner(scanner)
 +}
diff --git a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
index 30f18e7b0087..983ab9dbac05 100644
--- a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
+++ b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
@@ -1,20 +1,20 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2026-03-16 23:13:36 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2026-03-16 23:39:28 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go
-@@ -32,7 +32,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
+@@ -31,7 +31,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  func Get(m *Monitor) (CPUMetrics, error) {
  	procfs := m.Hostfs
  
 -	path := procfs.ResolveHostFS("/proc/stat")
 +	path := procfs.ResolveHostFS("/compat/linux/proc/stat")
  	fd, err := os.Open(path)
  	defer func() {
  		_ = fd.Close()
-@@ -46,7 +46,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
+@@ -45,7 +45,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  		return CPUMetrics{}, fmt.Errorf("scanning stat file: %w", err)
  	}
  
 -	cpuInfoPath := procfs.ResolveHostFS("/proc/cpuinfo")
 +	cpuInfoPath := procfs.ResolveHostFS("/compat/linux/proc/cpuinfo")
  	cpuInfoFd, err := os.Open(cpuInfoPath)
  	if err != nil {
  		return CPUMetrics{}, fmt.Errorf("opening '%s': %w", cpuInfoPath, err)
diff --git a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
index ea9a582f3c2b..0ca0296af848 100644
--- a/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
+++ b/sysutils/beats93/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
@@ -1,14 +1,14 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2026-03-16 23:13:36 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2026-03-16 23:39:28 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go
-@@ -37,9 +37,9 @@ func (fs *FSStat) GetUsage() error {
+@@ -36,9 +36,9 @@ func (fs *FSStat) GetUsage() error {
  
  	fs.Total = opt.UintWith(stat.Blocks).MultUint64OrNone(uint64(stat.Bsize))
  	fs.Free = opt.UintWith(stat.Bfree).MultUint64OrNone(uint64(stat.Bsize))
 -	fs.Avail = opt.UintWith(stat.Bavail).MultUint64OrNone(uint64(stat.Bsize))
 +	fs.Avail = opt.UintWith(uint64(stat.Bavail)).MultUint64OrNone(uint64(stat.Bsize))
  	fs.Files = opt.UintWith(stat.Files)
 -	fs.FreeFiles = opt.UintWith(stat.Ffree)
 +	fs.FreeFiles = opt.UintWith(uint64(stat.Ffree))
  
  	fs.fillMetrics()