diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 9f9678a8f73d..6a38ee0c05cc 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1766390125
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219
-SIZE (go/devel_gitaly/gitaly-v18.7.0/go.mod) = 14016
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/gitaly-v18.7.0.tar.bz2) = 37d08a890abbd15821a257001bbd56deecd8d4a79157c05e2be51672e01d089e
-SIZE (go/devel_gitaly/gitaly-v18.7.0/gitaly-v18.7.0.tar.bz2) = 4666224
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.7.0/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889
-SIZE (go/devel_gitaly/gitaly-v18.7.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
-SIZE (go/devel_gitaly/gitaly-v18.7.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
-SHA256 (go/devel_gitaly/gitaly-v18.7.0/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7
-SIZE (go/devel_gitaly/gitaly-v18.7.0/8309.patch) = 1285
+TIMESTAMP = 1768122772
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219
+SIZE (go/devel_gitaly/gitaly-v18.7.1/go.mod) = 14016
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitaly-v18.7.1.tar.bz2) = c2124af590bd632fae6fb2c5a93b6aa2ac7c8b3dceca049fa10d9b68e200c8f2
+SIZE (go/devel_gitaly/gitaly-v18.7.1/gitaly-v18.7.1.tar.bz2) = 4665993
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.7.1/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889
+SIZE (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.7.1/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7
+SIZE (go/devel_gitaly/gitaly-v18.7.1/8309.patch) = 1285
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 6c02d0d333a3..1df8066fec23 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766390142
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.0/v18.7.0.mod) = 81d663919a3c5095761afddedbd0a268c988262096cbfaeafd1d4a31c3cb83c4
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.0/v18.7.0.mod) = 9374
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.0/v18.7.0.zip) = 841da5f43cfa9b4dd616c62effc637c8e48260d23503e0d8d585034d437012a6
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.0/v18.7.0.zip) = 1857006
+TIMESTAMP = 1768122773
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.mod) = 81d663919a3c5095761afddedbd0a268c988262096cbfaeafd1d4a31c3cb83c4
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.mod) = 9374
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.zip) = d7f70ad4716cdf7e924e2b13d1f18a698df529d05a23ddf4035138b5c3141ce0
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.zip) = 1857016
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index f85533dba568..e1a70f3b9ae7 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766390148
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.0/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.0/go.mod) = 3523
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.0/gitlab-pages-v18.7.0.tar.bz2) = 3fa8238f79e389051044bd271021095480bd37ab494b65bf72c0774688a0ab56
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.0/gitlab-pages-v18.7.0.tar.bz2) = 237679
+TIMESTAMP = 1768122775
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.1/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.1/go.mod) = 3523
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.1/gitlab-pages-v18.7.1.tar.bz2) = d2577a2772fb2adb1df8d084e862f13366d8ebf2df617ef22f1dfeff2058b10e
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.1/gitlab-pages-v18.7.1.tar.bz2) = 237496
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 650ee4833b60..debebce077c7 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766390162
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.0/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.0/go.mod) = 9356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.0/gitlab-foss-v18.7.0.tar.bz2) = e64409b4214a1fb4317cdb9f9ee97ec69bf401a4a0527952b396bcaa3add4efa
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.0/gitlab-foss-v18.7.0.tar.bz2) = 129790096
+TIMESTAMP = 1768122791
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/go.mod) = 9356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/gitlab-foss-v18.7.1.tar.bz2) = 502774818fb7ce914a37f56c93cccc55b5d9ec77bed7c336d9da6fc850692882
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/gitlab-foss-v18.7.1.tar.bz2) = 129789285
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 99ff022c35de..fff781575765 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,19 +1,19 @@
-GITLAB_VERSION=		18.7.0
+GITLAB_VERSION=		18.7.1
 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 f21be6d0303f..aa5d73040691 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1766390112
-SHA256 (gitlab-foss-v18.7.0.tar.bz2) = e64409b4214a1fb4317cdb9f9ee97ec69bf401a4a0527952b396bcaa3add4efa
-SIZE (gitlab-foss-v18.7.0.tar.bz2) = 129790096
-TIMESTAMP = 1766390113
-SHA256 (gitlab-v18.7.0-ee.tar.bz2) = e4c0415dc236d82832faa794364335c4edcd7e45be9ac60c26f607dd67150bd9
-SIZE (gitlab-v18.7.0-ee.tar.bz2) = 146715871
+TIMESTAMP = 1768122719
+SHA256 (gitlab-foss-v18.7.1.tar.bz2) = 502774818fb7ce914a37f56c93cccc55b5d9ec77bed7c336d9da6fc850692882
+SIZE (gitlab-foss-v18.7.1.tar.bz2) = 129789285
+TIMESTAMP = 1768122762
+SHA256 (gitlab-v18.7.1-ee.tar.bz2) = fb883c3f6c7fcd6eaff1102bf2087fc0bbe9dba0dc402c77151fcd6bdaedbfad
+SIZE (gitlab-v18.7.1-ee.tar.bz2) = 146719684