diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index c45b28303553..c08e4e9a14d9 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,70 +1,74 @@
 PORTNAME=	gitlab-runner
 DISTVERSION=	16.7.0
+PORTREVISION=	1
 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
+
 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
 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-7-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 64702f1b576f..d69c524eaf54 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1704283890
+TIMESTAMP = 1705144234
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.7.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
 SIZE (go/devel_gitlab-runner/gitlab-runner-v16.7.0/prebuilt-x86_64.tar.xz) = 9594352
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.7.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
 SIZE (go/devel_gitlab-runner/gitlab-runner-v16.7.0/prebuilt-arm.tar.xz) = 9020896
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.7.0/go.mod) = 9bb87e747b8298c6ff48c6ddab5ee3bd544e21e8a09d148545093634a24fbfb8
 SIZE (go/devel_gitlab-runner/gitlab-runner-v16.7.0/go.mod) = 10425
 SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.7.0/gitlab-runner-v16.7.0.tar.bz2) = 64caa4aff7c86488690a100330d35a907b38e957ade079cdb05ccf0551a14e88
 SIZE (go/devel_gitlab-runner/gitlab-runner-v16.7.0/gitlab-runner-v16.7.0.tar.bz2) = 1349700
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.7.0/4551.patch) = 39f1433f5863b23008fceeb948d2084f9127a36eb322e765b14b67680e2d75b8
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.7.0/4551.patch) = 3146