diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile
index 2e08837cd389..e839e2a7dd5a 100644
--- a/sysutils/containers-common/Makefile
+++ b/sysutils/containers-common/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	containers-common
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.64.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Common manpages and config files for podman and buildah
 WWW=		https://github.com/containers
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC_common}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
 		go-md2man:textproc/go-md2man
 
 USES=		gmake
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	containers:common containers:image containers:skopeo \
 		containers:storage
 GH_PROJECT=	common:common image:image skopeo:skopeo storage:storage
 GH_TAGNAME=	v${DISTVERSION}:common v${IMAGEVERSION}:image \
 		v${SKOPEOVERSION}:skopeo v${STORAGEVERSION}:storage
 
 NO_ARCH=	yes
 
 IMAGEVERSION=	5.36.2
-SKOPEOVERSION=	1.20.0
+SKOPEOVERSION=	1.21.0
 STORAGEVERSION=	1.59.1
 
 post-patch:
 	${SED} -I '' /golangci/d ${WRKSRC_storage}/tests/tools/Makefile
 	${SED} -I '' -Ee s/go-md2man../go-md2man/ ${WRKSRC_storage}/tests/tools/Makefile
 
 do-build:
 	${GMAKE} -C ${WRKSRC_common}/docs
 	${GMAKE} -C ${WRKSRC_storage} install.tools
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/certs.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/hooks.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/registries.d
 	${INSTALL_DATA} ${WRKSRC_skopeo}/default-policy.json \
 		${STAGEDIR}${PREFIX}/etc/containers/policy.json.sample
 # Temporary until https://github.com/containers/common/pull/1199 propagates to podman and buildah
 	${INSTALL_DATA} ${PATCHDIR}/containers.conf \
 		${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample
 	${INSTALL_DATA} ${WRKSRC_storage}/storage.conf-freebsd \
 		${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample
 	${INSTALL_DATA} ${WRKSRC_image}/registries.conf \
 		${STAGEDIR}${PREFIX}/etc/containers/registries.conf.sample
 	${GMAKE} -C ${WRKSRC_common}/docs DESTDIR=${STAGEDIR} install
 	${GMAKE} -C ${WRKSRC_image} PREFIX=${STAGEDIR}${PREFIX} install-docs
 	${GMAKE} -C ${WRKSRC_storage}/docs GOMD2MAN=${LOCALBASE}/bin/go-md2man \
 		containers-storage.conf.5
 	${INSTALL_MAN} ${WRKSRC_storage}/docs/containers-storage.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/sysutils/containers-common/distinfo b/sysutils/containers-common/distinfo
index d525595c6d53..1a19505e1f50 100644
--- a/sysutils/containers-common/distinfo
+++ b/sysutils/containers-common/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1759417314
+TIMESTAMP = 1765209532
 SHA256 (containers-common-v0.64.2_GH0.tar.gz) = 12fdb97803ee428d6ad66d66c6b582598b23ded4c8476f30dab6b4e9582d4f67
 SIZE (containers-common-v0.64.2_GH0.tar.gz) = 13131015
 SHA256 (containers-image-v5.36.2_GH0.tar.gz) = 2002eac26c5818437a069173ed9b3550655098ce4b08464782a0c2e896c2e41e
 SIZE (containers-image-v5.36.2_GH0.tar.gz) = 764570
-SHA256 (containers-skopeo-v1.20.0_GH0.tar.gz) = 0c19fe51b2cd8d1bd5e38c03b97421e318fc08153bdf5ef2f816a29889eacdef
-SIZE (containers-skopeo-v1.20.0_GH0.tar.gz) = 10449131
+SHA256 (containers-skopeo-v1.21.0_GH0.tar.gz) = f76eeddf697a3cc7a872e3077ab4d0fdbebe9f3c6171462e3e9feb84368b3fac
+SIZE (containers-skopeo-v1.21.0_GH0.tar.gz) = 10187308
 SHA256 (containers-storage-v1.59.1_GH0.tar.gz) = 2d4b0e5f66c83c776c6dab81fd52bee2aac72832ef3af4e6a1e081aaf1f87f30
 SIZE (containers-storage-v1.59.1_GH0.tar.gz) = 4606021