diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index a611e271e6ad..f1c6398bf1ca 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.6.1
-PORTREVISION=	1
+DISTVERSION=	16.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index b80ae48ead78..5c3e89d3f233 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1701413437
-SHA256 (go/devel_gitaly/gitaly-v16.6.1/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
-SIZE (go/devel_gitaly/gitaly-v16.6.1/go.mod) = 10585
-SHA256 (go/devel_gitaly/gitaly-v16.6.1/gitaly-v16.6.1.tar.bz2) = f3cfba5cedb2a2b65e3f4562a828ac8516c6e03933b2a3667558f8383e21dea0
-SIZE (go/devel_gitaly/gitaly-v16.6.1/gitaly-v16.6.1.tar.bz2) = 2507882
+TIMESTAMP = 1702530426
+SHA256 (go/devel_gitaly/gitaly-v16.6.2/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
+SIZE (go/devel_gitaly/gitaly-v16.6.2/go.mod) = 10585
+SHA256 (go/devel_gitaly/gitaly-v16.6.2/gitaly-v16.6.2.tar.bz2) = 5cf8d08d0c0ca5a7b7c4fc09203f8e254f83fddb94b15b51f2b0b0b6049391a9
+SIZE (go/devel_gitaly/gitaly-v16.6.2/gitaly-v16.6.2.tar.bz2) = 2507351
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 8d34fd0f9f7a..ed2eb7759df8 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.6.1
+PORTVERSION=	16.6.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	www devel
 
 # include patch to fix database migration
-https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018.patch
-PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
-PATCHFILES+=	138018.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018
+#https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018.patch
+#PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
+#PATCHFILES+=	138018.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index b6170c0d69cd..de0b7ad826b0 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1701429641
-SHA256 (gitlab-foss-v16.6.1.tar.bz2) = a565c68234dad67f2661272e40991644879d2e9639c57dc5715389d805839314
-SIZE (gitlab-foss-v16.6.1.tar.bz2) = 100405560
+TIMESTAMP = 1702530421
+SHA256 (gitlab-foss-v16.6.2.tar.bz2) = fba845ee5fc318da3c42f6256297d083f1134720815807b97c2e2610dc8cbc51
+SIZE (gitlab-foss-v16.6.2.tar.bz2) = 100424350
 SHA256 (138018.patch) = 2aaa34cc9e58c0220ffb3e13ae2ec10f62a3e3b18e5f684adbaf2d90745c1353
 SIZE (138018.patch) = 6399
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index ee052d9b5081..0041e78be0b6 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.6.1
-PORTREVISION=	1
+PORTVERSION=	16.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index e4564e5926ce..42617b4190b7 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1701413478
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.1/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.1/go.mod) = 2931
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.1/gitlab-pages-v16.6.1.tar.bz2) = 4cab9810551f44c7f9a6ccafccb5039506706c76d809ede9fb7f56b1c2039bd9
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.1/gitlab-pages-v16.6.1.tar.bz2) = 203526
+TIMESTAMP = 1702530446
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.2/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.2/go.mod) = 2931
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.2/gitlab-pages-v16.6.2.tar.bz2) = f5ee7eaac98abd49c5207475967b11b1eacaa2e8018674ea63ea82e9797b4e41
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.2/gitlab-pages-v16.6.2.tar.bz2) = 203495
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 2233fb21d006..84c1b162c22c 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.6.1
-PORTREVISION=	1
+PORTVERSION=	16.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 9df2cfe4b630..e75b4c0a3e04 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1701413277
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.1/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.1/go.mod) = 6781
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.1/gitlab-foss-v16.6.1.tar.bz2) = a565c68234dad67f2661272e40991644879d2e9639c57dc5715389d805839314
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.1/gitlab-foss-v16.6.1.tar.bz2) = 100405560
+TIMESTAMP = 1702530356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/go.mod) = 6781
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/gitlab-foss-v16.6.2.tar.bz2) = fba845ee5fc318da3c42f6256297d083f1134720815807b97c2e2610dc8cbc51
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/gitlab-foss-v16.6.2.tar.bz2) = 100424350