edis-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \
 	rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \
 	rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \
-	rubygem-redis-clustering>=5.4.1<5.5:databases/rubygem-redis-clustering \
+	rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \
 	rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
 	rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index d7451fad1606..f8a74c64788b 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION=		18.3.4
-GITLAB_PORTREVISION=	3
+GITLAB_VERSION=		18.3.5
+GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index d96db7593374..1ac0e8dc35ce 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1760008203
-SHA256 (gitlab-foss-v18.3.4.tar.bz2) = 7dc2674dd29204f3ad154cb90f31eb91b4549f78a4a45d32401faee70be76136
-SIZE (gitlab-foss-v18.3.4.tar.bz2) = 122267479
-TIMESTAMP = 1760008249
-SHA256 (gitlab-v18.3.4-ee.tar.bz2) = a7febfcce3f98d8cf46714631032b7f43c3df057a24d92491f6d57cc32b385da
-SIZE (gitlab-v18.3.4-ee.tar.bz2) = 138182651
+TIMESTAMP = 1761126561
+SHA256 (gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2
+SIZE (gitlab-foss-v18.3.5.tar.bz2) = 122289928
+TIMESTAMP = 1761126604
+SHA256 (gitlab-v18.3.5-ee.tar.bz2) = 27d8c7de165fe25714305a070707626635f5d9f397837a86279b1ac875576732
+SIZE (gitlab-v18.3.5-ee.tar.bz2) = 138198849
diff --git a/www/rubygem-coverband/Makefile b/www/rubygem-coverband/Makefile
index 2e1e1e7adbc2..53bf6b9cf467 100644
--- a/www/rubygem-coverband/Makefile
+++ b/www/rubygem-coverband/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	coverband
 PORTVERSION=	6.1.5
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-base64>=0:converters/rubygem-base64 \
-		rubygem-redis>=3.0:databases/rubygem-redis
+		rubygem-redis-gitlab>=3.0:databases/rubygem-redis-gitlab
 
 USES=		gem shebangfix
 
diff --git a/www/rubygem-redis-rack-gitlab/Makefile b/www/rubygem-redis-rack-gitlab/Makefile
index f330ace9ea51..dd44fd2612b4 100644
--- a/www/rubygem-redis-rack-gitlab/Makefile
+++ b/www/rubygem-redis-rack-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	redis-rack
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -13,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 RUN_DEPENDS=	rubygem-rack-session10>=0.2.0:www/rubygem-rack-session10 \
-		rubygem-redis-store>=1.2<2:devel/rubygem-redis-store
+		rubygem-redis-store-gitlab>=1.2<2:devel/rubygem-redis-store-gitlab
 
 USES=		gem