diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index 31403f58da77..627bf24ca197 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,26 +1,19 @@
 PORTNAME=	cloudquery
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.32.0
-PORTREVISION=	31
+DISTVERSION=	6.41.1
 CATEGORIES=	net
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Transform cloud infrastructure into queryable SQL tables
 WWW=		https://cloudquery.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
-USE_GITHUB=	nodefault
-GH_TUPLE=	golang:sys:v0.6.0:sys
 
-GO_MODULE=	github.com/cloudquery/cloudquery
+GO_MODULE=	github.com/cloudquery/cloudquery/v6
 
 PLIST_FILES=	bin/${PORTNAME}
 
-pre-patch:
-	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
-	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
-
 .include <bsd.port.mk>
diff --git a/net/cloudquery/distinfo b/net/cloudquery/distinfo
index 2fb15c83e7d6..b086402ac678 100644
--- a/net/cloudquery/distinfo
+++ b/net/cloudquery/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1681579780
-SHA256 (go/net_cloudquery/cloudquery-v0.32.0/v0.32.0.mod) = e2d9e9ed2a666d2e6926a5da2c425b5e327515ee57cbb0e976ea0dd0355b4497
-SIZE (go/net_cloudquery/cloudquery-v0.32.0/v0.32.0.mod) = 9289
-SHA256 (go/net_cloudquery/cloudquery-v0.32.0/v0.32.0.zip) = b3422c7661079a8f94fdd7ae256c9d2d851981536b13c2007798ede77f6b5b30
-SIZE (go/net_cloudquery/cloudquery-v0.32.0/v0.32.0.zip) = 294077
-SHA256 (go/net_cloudquery/cloudquery-v0.32.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
-SIZE (go/net_cloudquery/cloudquery-v0.32.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
+TIMESTAMP = 1787321531
+SHA256 (go/net_cloudquery/cloudquery-v6.41.1/v6.41.1.mod) = 16f79f718dbff524f588c8dc492ee6404726348d115a509c11fc74e174bbe846
+SIZE (go/net_cloudquery/cloudquery-v6.41.1/v6.41.1.mod) = 8570
+SHA256 (go/net_cloudquery/cloudquery-v6.41.1/v6.41.1.zip) = 2fdc6eca152e83dbca61e75cf393f104db9a6c5223a08d6e9c64637b54dba2cb
+SIZE (go/net_cloudquery/cloudquery-v6.41.1/v6.41.1.zip) = 905830