diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index a50a10ff618f..c3a669e7dc30 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,79 +1,78 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
-DISTVERSION=	18.6.1
-PORTREVISION=	1
+DISTVERSION=	18.6.2
 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+=	5961.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5961, Fix "unable to get password from user" errors in shell executor
+PATCHFILES+=	5966.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5966, Fix bash shell cleanup to support variable expansion in paths
 #PATCH_SITES=	https://gitlab.com/mfechner/gitlab-runner/-/commit/
 #PATCHFILES+=	2f12af03ccd5fe875d583ddc8b976329b635fd22.patch:-p1
 
 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 \
 		gitlab-analyzers-secrets>=0:security/gitlab-analyzers-secrets
 
 USES=		go:modules,1.24
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 USE_RC_SUBR=	gitlab_runner
 # this branch removes the replace line in go.mod which breaks the way FreeBSD ports build go packages
 GO_MOD_DIST=	https://gitlab.com/mfechner/gitlab-runner/-/raw/18-6-stable/
 
 GITBRANCH=	18-6-stable
 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"
 
 # 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*:}
 # ---------------------------
 
 USERS=		gitlab-runner
 GROUPS=		gitlab-runner
 
 PLIST_FILES=	bin/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 21e737fe99a5..c395d539e1ce 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1763928380
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-x86_64.tar.xz) = 9594352
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/prebuilt-arm.tar.xz) = 9020896
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/go.mod) = 82fa95d31cd6973595b6af8467db047db6731d50e16681561f9f4a7f2c271491
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/go.mod) = 13992
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/gitlab-runner-v18.6.1.tar.bz2) = 18ff6f31daba6afb697c3c6c2cb0e542f5d2e9e5c8a088e4b0c6b91abcd9ff37
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/gitlab-runner-v18.6.1.tar.bz2) = 2097455
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.1/5961.patch) = 532ba5d8ee60cc81b6ae76564e9f14384192557b221f0d78a5d209e195e0958f
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.1/5961.patch) = 8331
+TIMESTAMP = 1764246727
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.2/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.2/prebuilt-x86_64.tar.xz) = 9594352
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.2/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.2/prebuilt-arm.tar.xz) = 9020896
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.2/go.mod) = 82fa95d31cd6973595b6af8467db047db6731d50e16681561f9f4a7f2c271491
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.2/go.mod) = 13992
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.2/gitlab-runner-v18.6.2.tar.bz2) = e628e3a22f6b97e1e55ee0009ad57bc8d91142ff38f11a77a82d68ad950756ad
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.2/gitlab-runner-v18.6.2.tar.bz2) = 2098175
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.6.2/5966.patch) = 52130ded5234c4612bcc83a39721589f73a5fe18e908381a61f2801f2df85b4a
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.6.2/5966.patch) = 5702