diff --git a/ports-mgmt/caronade/Makefile b/ports-mgmt/caronade/Makefile
index fce280a10060..114da951056f 100644
--- a/ports-mgmt/caronade/Makefile
+++ b/ports-mgmt/caronade/Makefile
@@ -1,37 +1,21 @@
 PORTNAME=	caronade
 DISTVERSIONPREFIX=v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.5.0
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Small and light tool to help with FreeBSD Ports CI
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	sassc:textproc/sassc
 
 USES=		go:modules,no_targets
 USE_RC_SUBR=	caronade
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	decke
+GO_MODULE=	github.com/decke/caronade
 
 MAKE_ENV+=	GO_BUILDFLAGS="${GO_BUILDFLAGS}"
 
-GH_TUPLE=	\
-		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:62affa334b73:golang_net/vendor/golang.org/x/net \
-		golang:sys:aee5d888a860:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
-		labstack:echo:v4.1.17:labstack_echo_v4/vendor/github.com/labstack/echo/v4 \
-		labstack:gommon:v0.3.0:labstack_gommon/vendor/github.com/labstack/gommon \
-		mattn:go-colorable:v0.1.7:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		unrolled:secure:v1.0.8:unrolled_secure/vendor/github.com/unrolled/secure \
-		valyala:bytebufferpool:v1.0.0:valyala_bytebufferpool/vendor/github.com/valyala/bytebufferpool \
-		valyala:fasttemplate:v1.2.1:valyala_fasttemplate/vendor/github.com/valyala/fasttemplate
-
 .include <bsd.port.mk>
diff --git a/ports-mgmt/caronade/distinfo b/ports-mgmt/caronade/distinfo
index 4347b41a6bf1..477dda8edc09 100644
--- a/ports-mgmt/caronade/distinfo
+++ b/ports-mgmt/caronade/distinfo
@@ -1,29 +1,5 @@
-TIMESTAMP = 1600779867
-SHA256 (decke-caronade-v0.4.0_GH0.tar.gz) = 9cdabd1fdd802bd36f5d1827d0fe6d7a04a0a59861c07cc1a09aeae6d25bbe7e
-SIZE (decke-caronade-v0.4.0_GH0.tar.gz) = 44965
-SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63
-SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
-SHA256 (golang-crypto-5c72a883971a_GH0.tar.gz) = 2b8df0754ba64c95786bc5fe2071cadf4757f754e774f5985d725c1aaa6cb3d8
-SIZE (golang-crypto-5c72a883971a_GH0.tar.gz) = 1732429
-SHA256 (golang-net-62affa334b73_GH0.tar.gz) = abc8bc764836181f0b510d48efcfbaaf9ad8858f799b23e4bbc6fa73291ffd23
-SIZE (golang-net-62affa334b73_GH0.tar.gz) = 1179195
-SHA256 (golang-sys-aee5d888a860_GH0.tar.gz) = c2c4ec22277205cd4d2311e14672749e217ffd28d9eefbb60a7f8a5eb722ab36
-SIZE (golang-sys-aee5d888a860_GH0.tar.gz) = 1065566
-SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
-SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
-SHA256 (labstack-echo-v4.1.17_GH0.tar.gz) = 517bcd0dd6ac4d3f1652cfbad992b50dcd99b774c219d6af5c095460cd504dd8
-SIZE (labstack-echo-v4.1.17_GH0.tar.gz) = 295835
-SHA256 (labstack-gommon-v0.3.0_GH0.tar.gz) = c23fa6b18c3f3c4dc917e7fb6d40db88ca2d13f51dbc9a8e8e098b8aa03611e9
-SIZE (labstack-gommon-v0.3.0_GH0.tar.gz) = 11426
-SHA256 (mattn-go-colorable-v0.1.7_GH0.tar.gz) = e394441b47cb26bb0c60ffdf2c60d57facbbc39f7a60763fdb1ec752cb460abf
-SIZE (mattn-go-colorable-v0.1.7_GH0.tar.gz) = 9560
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (unrolled-secure-v1.0.8_GH0.tar.gz) = 3a60fbf23078c8e16665e342e9edd9f8fe4a32b17e474bba385949ca48ca669d
-SIZE (unrolled-secure-v1.0.8_GH0.tar.gz) = 13471
-SHA256 (valyala-bytebufferpool-v1.0.0_GH0.tar.gz) = 089013e3429ebe7fd2bc3527f003bf3f3f639891e5d8ba6a56010e3671465e1f
-SIZE (valyala-bytebufferpool-v1.0.0_GH0.tar.gz) = 5025
-SHA256 (valyala-fasttemplate-v1.2.1_GH0.tar.gz) = 14881149dfc3d49606728d0c8e704cfaeb7fbbf2c42d20e771cf1bbae9fb1044
-SIZE (valyala-fasttemplate-v1.2.1_GH0.tar.gz) = 11550
+TIMESTAMP = 1637597627
+SHA256 (go/ports-mgmt_caronade/caronade-v0.5.0/v0.5.0.mod) = fe0ce810176ddc1c5c17a935348e9ab1df3ca2addee1442804d71354cd66d9ce
+SIZE (go/ports-mgmt_caronade/caronade-v0.5.0/v0.5.0.mod) = 151
+SHA256 (go/ports-mgmt_caronade/caronade-v0.5.0/v0.5.0.zip) = 6dfcc267033c4cd2552ce1a254f78cff77fa1f6ac4d56a8d8f91bbc6a757f844
+SIZE (go/ports-mgmt_caronade/caronade-v0.5.0/v0.5.0.zip) = 79528