diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 4e8e2a9ab18e..089c8207b1d0 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	15.11.0
+PORTVERSION=	16.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GitLab kubernetes agent
 WWW=		https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent
 
 LICENSE=	MIT
 
 # bazel>=0:devel/bazel  \
 BUILD_DEPENDS=	git>=0:devel/git \
 		golangci-lint>=0:devel/golangci-lint
 
 USES=		go:modules
-GO_MODULE=	gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15
+GO_MODULE=	gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
 GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
 		-ldflags=" \
-		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Version=v${PORTVERSION}' \
-		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}' \
-		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.BuildTime=${_BUILD_DATE}'"
+		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Version=v${PORTVERSION}' \
+		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}' \
+		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.BuildTime=${_BUILD_DATE}'"
 GO_TARGET=     ./cmd/kas
 
 PLIST_FILES=	bin/kas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas
 
 .include <bsd.port.mk>
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 36e720bf2ac7..190ed556e698 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1682145775
-SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 6aaae783c3e97fcd41a5a05ff0d20e05867d7bbb77ce13ba8d2fda6e0c907d58
-SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 10767
-SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 5b0db2a41e117b4b6c028fcd5dc16d4a5160b000afd29443163872474e04cbb2
-SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 984432
+TIMESTAMP = 1684559854
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.mod) = ff021521aceabf93ee5e78d92c4e58a75fa6b1c9ed683bf0c52ae5953841e5da
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.mod) = 11681
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.zip) = ad0c2a99e4f10c564f289f09f8ea54ee6aa3edc58162ea992b575898d037c609
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.zip) = 1015772
diff --git a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go
new file mode 100644
index 000000000000..1110b8c3e8b7
--- /dev/null
+++ b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go
@@ -0,0 +1,11 @@
+--- vendor/go.opentelemetry.io/otel/sdk/resource/host_id_exec.go.orig	2023-05-20 05:42:01 UTC
++++ vendor/go.opentelemetry.io/otel/sdk/resource/host_id_exec.go
+@@ -12,7 +12,7 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
+-//go:build bsd || darwin
++//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris
+ 
+ package resource // import "go.opentelemetry.io/otel/sdk/resource"
+ 
diff --git a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go
new file mode 100644
index 000000000000..dc2d2b4ab376
--- /dev/null
+++ b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go
@@ -0,0 +1,11 @@
+--- vendor/go.opentelemetry.io/otel/sdk/resource/host_id_readfile.go.orig	2023-05-20 05:42:17 UTC
++++ vendor/go.opentelemetry.io/otel/sdk/resource/host_id_readfile.go
+@@ -12,7 +12,7 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
+-//go:build bsd || linux
++//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris
+ 
+ package resource // import "go.opentelemetry.io/otel/sdk/resource"
+