diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index ef1184d177eb..b0320bff6120 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1763615394
-SHA256 (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
-SIZE (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 14044
-SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = d182251c770cc67e1def2d621ad51415717d8ca093df87d357e918dcf56cefdf
-SIZE (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = 4657060
-SHA256 (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
-SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
-SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
-SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
+TIMESTAMP = 1764220553
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
+SIZE (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 14044
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 598192b4c0ea1f323ff085db5ff02e507d698456fdf5333e562f0360a319abbc
+SIZE (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 4656878
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
+SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 4eae96073e3c..9264b441b489 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1763614383
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.mod) = 9944
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.zip) = c49a4a6cd1dc52f3dbeb2f7f7075e4155c6679d3d7c207a9ad9ca73a7544c20a
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.0/v18.6.0.zip) = 1917071
+TIMESTAMP = 1764220554
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 9944
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = bd3e864462912f0b7f1807f03147b026ce967a505d9931ef52d9627008e9e233
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = 1917078
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index a4256f8b6aec..6b4d712631f2 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1763614388
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/go.mod) = 3416
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = e74a8dfdb8fea931886c48cf242299988615136ac003d84762e6435e8fbb6efb
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.0/gitlab-pages-v18.6.0.tar.bz2) = 236677
+TIMESTAMP = 1764220556
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 3416
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 8c4823f800fa497ed170035bdd384b4ccece0c2ece38d2bc8c54b45243268e25
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 237391
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 8d31232d84cc..82201c1779fd 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1763614433
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/go.mod) = 9356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.0/gitlab-foss-v18.6.0.tar.bz2) = 126821552
+TIMESTAMP = 1764220573
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 9356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = 126836032
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 646a93dc3e95..add3ff56d9f5 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,19 +1,19 @@
-GITLAB_VERSION=		18.6.0
-GITLAB_PORTREVISION=	0
+GITLAB_VERSION=		18.6.1
+GITLAB_PORTREVISION=	1	# 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=	419c72cb8ada252b260efc38ff91fe201de7c8c3
 GITLAB_GIT_PREV_VERSION=	23466173824c0a0f835c0d790c2f38156ae6284a
 
 # Overwrite version for gitlab-kas-grpc
 #GITLAB_KAS_GRPC_VERSION=	${GITLAB_VERSION}
 GITLAB_KAS_GRPC_VERSION=	18.5.2
 
 # Rails version
 RAILS_VERSION=	7.1.6
 
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 341c68edb483..63867e3852b9 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1763647030
-SHA256 (gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55
-SIZE (gitlab-foss-v18.6.0.tar.bz2) = 126821552
-TIMESTAMP = 1763647031
-SHA256 (gitlab-v18.6.0-ee.tar.bz2) = d1d07dcd0f79b244cf3d7d1acb5bd1b29d1dcc4aae3d11f932df8a51f62135fb
-SIZE (gitlab-v18.6.0-ee.tar.bz2) = 143690179
+TIMESTAMP = 1764220477
+SHA256 (gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
+SIZE (gitlab-foss-v18.6.1.tar.bz2) = 126836032
+TIMESTAMP = 1764220540
+SHA256 (gitlab-v18.6.1-ee.tar.bz2) = d26f8ce1949e9283ce6766e46798752a448c78055f47d82d6433fcf27aaacd6d
+SIZE (gitlab-v18.6.1-ee.tar.bz2) = 143698518