diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index d0dc05bab7ea..866b78943ec6 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1768888154
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219
-SIZE (go/devel_gitaly/gitaly-v18.8.1/go.mod) = 14016
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/gitaly-v18.8.1.tar.bz2) = 77f5df0d6a37f7f7d401aab47f17e50ab1e8126a0f0664277c05497166d0079a
-SIZE (go/devel_gitaly/gitaly-v18.8.1/gitaly-v18.8.1.tar.bz2) = 4669198
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.8.1/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889
-SIZE (go/devel_gitaly/gitaly-v18.8.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
-SIZE (go/devel_gitaly/gitaly-v18.8.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
-SHA256 (go/devel_gitaly/gitaly-v18.8.1/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7
-SIZE (go/devel_gitaly/gitaly-v18.8.1/8309.patch) = 1285
+TIMESTAMP = 1768971214
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219
+SIZE (go/devel_gitaly/gitaly-v18.8.2/go.mod) = 14016
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/gitaly-v18.8.2.tar.bz2) = aa684bc0dd0e0ff73ae7775ae5cff28362123c26de71fdfa7d58c3703bc1e02c
+SIZE (go/devel_gitaly/gitaly-v18.8.2/gitaly-v18.8.2.tar.bz2) = 4669297
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.8.2/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889
+SIZE (go/devel_gitaly/gitaly-v18.8.2/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.8.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.8.2/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7
+SIZE (go/devel_gitaly/gitaly-v18.8.2/8309.patch) = 1285
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 329afae3c93a..3ac90793bf04 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1768888154
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.1/v18.8.1.mod) = c73014e839dd525bdc8be99cf243eba6375af8846617eae3a40d2418816a410b
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.1/v18.8.1.mod) = 9374
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.1/v18.8.1.zip) = 268c75b6689b52887a8f33a65649d242c1bb51b821481f315933665dfd14c0a5
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.1/v18.8.1.zip) = 1869235
+TIMESTAMP = 1768971215
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.2/v18.8.2.mod) = c73014e839dd525bdc8be99cf243eba6375af8846617eae3a40d2418816a410b
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.2/v18.8.2.mod) = 9374
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.2/v18.8.2.zip) = b975667a0eadc055af23feaba061152d0054cfc40f47b14edff39bda9a0aec88
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.2/v18.8.2.zip) = 1869245
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index da69f69e21f3..f6f9f33377dc 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1768888156
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.1/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.1/go.mod) = 3523
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.1/gitlab-pages-v18.8.1.tar.bz2) = 6d236d0e9826aad55bedc597236fb3bb09520a480f6b97b78ac58d6a6cd5526b
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.1/gitlab-pages-v18.8.1.tar.bz2) = 237461
+TIMESTAMP = 1768971217
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.2/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.2/go.mod) = 3523
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.2/gitlab-pages-v18.8.2.tar.bz2) = 38f1d3f0fdbcb231f604279c29d4ccc8292adfcb205986ab0ef3a0982253ca26
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.2/gitlab-pages-v18.8.2.tar.bz2) = 237654
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 29abcdc03726..8349cd1d845e 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1768888174
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.1/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.1/go.mod) = 9356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.1/gitlab-foss-v18.8.1.tar.bz2) = 38516b9a76074f4da1f5126136880b1c70fc25c293de154fb57107bf94e5d3e2
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.1/gitlab-foss-v18.8.1.tar.bz2) = 130218388
+TIMESTAMP = 1768971237
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.2/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.2/go.mod) = 9356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.2/gitlab-foss-v18.8.2.tar.bz2) = 23de178a65db1ca2304f87dc24bb3616359f405fc6796adf46afd07fcc285107
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.2/gitlab-foss-v18.8.2.tar.bz2) = 130225942
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 88c28ae8c27d..022c77094f6c 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,19 +1,19 @@
-GITLAB_VERSION=		18.8.1
+GITLAB_VERSION=		18.8.2
 GITLAB_PORTREVISION=	4	# decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
 # and from https://gitlab.com/gitlab-org/git/-/tags
 GITLAB_GIT_VERSION=	2.50.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
 GITLAB_GIT_MASTER_VERSION=	aea8cc3a10c325a22a75e2d4f582db959d3854ae
 GITLAB_GIT_PREV_VERSION=	419c72cb8ada252b260efc38ff91fe201de7c8c3
 
 # Overwrite version for gitlab-kas-grpc
 #GITLAB_KAS_GRPC_VERSION=	${GITLAB_VERSION}
 GITLAB_KAS_GRPC_VERSION=	18.5.2
 
 # Rails version
 RAILS_VERSION=	7.2.3
 
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 3722352b00cc..7e1a77c7d55f 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1768888102
-SHA256 (gitlab-foss-v18.8.1.tar.bz2) = 38516b9a76074f4da1f5126136880b1c70fc25c293de154fb57107bf94e5d3e2
-SIZE (gitlab-foss-v18.8.1.tar.bz2) = 130218388
-TIMESTAMP = 1768888146
-SHA256 (gitlab-v18.8.1-ee.tar.bz2) = 2101df67495fb8b48f801665f3a19c516496ab52232ead60577f11f7f24a4dec
-SIZE (gitlab-v18.8.1-ee.tar.bz2) = 147335039
+TIMESTAMP = 1768971990
+SHA256 (gitlab-foss-v18.8.2.tar.bz2) = 23de178a65db1ca2304f87dc24bb3616359f405fc6796adf46afd07fcc285107
+SIZE (gitlab-foss-v18.8.2.tar.bz2) = 130225942
+TIMESTAMP = 1768971991
+SHA256 (gitlab-v18.8.2-ee.tar.bz2) = 22bccdff98b000acd599afe9a6eb67e0b36d4fe24f5fac92b84f05990c7b1f1c
+SIZE (gitlab-v18.8.2-ee.tar.bz2) = 147373952