diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile
index 7ba93de7c144..2dc41b1456c5 100644
--- a/sysutils/containers-common/Makefile
+++ b/sysutils/containers-common/Makefile
@@ -1,55 +1,54 @@
 PORTNAME=	containers-common
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.60.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
 COMMENT=	Common manpages and config files for podman and buildah
 WWW=		https://github.com/containers
 
 LICENSE=	GPLv2
 
 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:storage \
 		containers:skopeo
 GH_PROJECT=	common:common image:image storage:storage skopeo:skopeo
 GH_TAGNAME=	v${DISTVERSION}:common v${IMAGEVERSION}:image \
 		v${STORAGEVERSION}:storage v${SKOPEOVERSION}:skopeo
 
 NO_ARCH=	yes
 
 IMAGEVERSION=	5.32.2
 STORAGEVERSION=	1.55.1
 SKOPEOVERSION=	1.16.1
 
-WRKSRC=		${WRKDIR}/common-${DISTVERSION}
-IMAGESRC=	${WRKDIR}/image-${IMAGEVERSION}
-STORAGESRC=	${WRKDIR}/storage-${STORAGEVERSION}
-SKOPEOSRC=	${WRKDIR}/skopeo-${SKOPEOVERSION}
-
 do-build:
-	${GMAKE} -C ${WRKSRC}/docs
-	${GMAKE} -C ${STORAGESRC} install.tools
+	${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} ${SKOPEOSRC}/default-policy.json ${STAGEDIR}${PREFIX}/etc/containers/policy.json.sample
+	${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}/pkg/config/containers.conf-freebsd ${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample
-	${INSTALL_DATA} ${STORAGESRC}/storage.conf-freebsd ${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample
-	${INSTALL_DATA} ${IMAGESRC}/registries.conf ${STAGEDIR}${PREFIX}/etc/containers/registries.conf.sample
-	${GMAKE} -C ${WRKSRC}/docs DESTDIR=${STAGEDIR} install
-	${GMAKE} -C ${IMAGESRC} PREFIX=${STAGEDIR}${PREFIX} install-docs
-	${GMAKE} -C ${STORAGESRC}/docs GOMD2MAN=${LOCALBASE}/bin/go-md2man containers-storage.conf.5
-	${INSTALL_MAN} ${STORAGESRC}/docs/containers-storage.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
+	${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>