diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index fa4ef15a8fef..2e8e8f29beaa 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	gitlab-runner
-DISTVERSION=	16.8.0
+DISTVERSION=	16.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
 DISTFILES=	prebuilt-x86_64.tar.xz:dockerx64 \
 		prebuilt-arm.tar.xz:dockerarm
 
-PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
-PATCHFILES+=	4551.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4551, Allow FreeBSD to be used with Docker builds
+#PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
+#PATCHFILES+=	4551.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4551, Allow FreeBSD to be used with Docker builds
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Official GitLab Runner written in Go
 WWW=		https://gitlab.com/gitlab-org/gitlab-runner
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 RUN_DEPENDS=	bash:shells/bash \
 		ca_root_nss>=0:security/ca_root_nss \
 		git:devel/git
 
-USES=		go:modules
+USES=		go:modules,1.21
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-runner
 
 _BUILD_DATE=	$$(date -u +%Y-%m-%dT%H:%M:%S%z)
 GO_BUILDFLAGS= -ldflags=" \
 		-X gitlab.com/gitlab-org/gitlab-runner/commands.ROOTCONFIGDIR=${ETCDIR} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${DISTVERSION} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${_BUILD_DATE} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \
 		-s -w"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
-GITBRANCH=	16-8-stable
+GITBRANCH=	16-9-stable
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-runner/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Nprebuilt*:}
 # ---------------------------
 
 PLIST_FILES=	bin/gitlab-runner
 
 USE_RC_SUBR=	gitlab_runner
 
 USERS=		gitlab-runner
 GROUPS=		gitlab-runner
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
 
 pre-build:
 	@cd ${WRKSRC} && go-bindata \
 		-pkg docker \
 		-nocompress \
 		-nomemcopy \
 		-nometadata \
 		-prefix out/docker/ \
 		-o executors/docker/bindata.go \
 		out/docker/prebuilt-x86_64.tar.xz \
 		out/docker/prebuilt-arm.tar.xz
 
 .include <bsd.port.mk>
diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo
index 7c747f021085..ffff6fee2d09 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1706202759
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.8.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.8.0/prebuilt-x86_64.tar.xz) = 9594352
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.8.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.8.0/prebuilt-arm.tar.xz) = 9020896
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.8.0/go.mod) = 27312143e950ac6cb219cf0ebe7d7b60dbb1355f6cc619d7f26574211495db14
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.8.0/go.mod) = 10444
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.8.0/gitlab-runner-v16.8.0.tar.bz2) = 182d5aecfa62193e5815a9335f5138fdfd52f2e394314fddcbedfcfa84601981
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.8.0/gitlab-runner-v16.8.0.tar.bz2) = 1351894
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.8.0/4551.patch) = 39f1433f5863b23008fceeb948d2084f9127a36eb322e765b14b67680e2d75b8
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.8.0/4551.patch) = 3146
+TIMESTAMP = 1708406444
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.9.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.9.0/prebuilt-x86_64.tar.xz) = 9594352
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.9.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.9.0/prebuilt-arm.tar.xz) = 9020896
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.9.0/go.mod) = 11ab3d9833bb178f098f9ffd9d04bf932850350392e3ba69e06072199ea0ebb3
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.9.0/go.mod) = 10444
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.9.0/gitlab-runner-v16.9.0.tar.bz2) = 405ba5f2895e87cdcb1da2095660458d44984e04423dfc966606401bffdc9f3d
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.9.0/gitlab-runner-v16.9.0.tar.bz2) = 1361920