diff --git a/devel/py-apipkg/Makefile b/devel/py-apipkg/Makefile
index f18f1d09ef7..e59834b6f77 100644
--- a/devel/py-apipkg/Makefile
+++ b/devel/py-apipkg/Makefile
@@ -17,9 +17,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODULES =		lang/python
-MODPY_PYBUILD =		hatchling
+MODPY_PYBUILD =		hatch-vcs
 NO_TEST =		Yes
 
-BUILD_DEPENDS =		devel/py-hatch-vcs${MODPY_FLAVOR}
-
 .include <bsd.port.mk>
diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile
index 9199459a40c..1b14360b00a 100644
--- a/devel/py-jsonschema/Makefile
+++ b/devel/py-jsonschema/Makefile
@@ -14,15 +14,14 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_PYBUILD =		hatchling
+MODPY_PYBUILD =		hatch-vcs
 MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	jsonschema
 
 FLAVORS =		python3
 FLAVOR =		python3
 
-BUILD_DEPENDS =		devel/py-hatch-vcs${MODPY_FLAVOR} \
-			devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR}
 
 RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-pyrsistent${MODPY_FLAVOR}
diff --git a/graphics/py-termcolor/Makefile b/graphics/py-termcolor/Makefile
index a39813d050a..025762ad24f 100644
--- a/graphics/py-termcolor/Makefile
+++ b/graphics/py-termcolor/Makefile
@@ -18,10 +18,8 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_PYBUILD =		hatchling
+MODPY_PYBUILD =		hatch-vcs
 FLAVOR =		python3
 FLAVORS =		python3
 
-BUILD_DEPENDS =		devel/py-hatch-vcs${MODPY_FLAVOR}
-
 .include <bsd.port.mk>
diff --git a/sysutils/py-platformdirs/Makefile b/sysutils/py-platformdirs/Makefile
index 5fbdfaf2348..5e9fa364416 100644
--- a/sysutils/py-platformdirs/Makefile
+++ b/sysutils/py-platformdirs/Makefile
@@ -14,12 +14,9 @@ PERMIT_PACKAGE=	Yes
 MODULES=	lang/python
 
 MODPY_PI=	Yes
-MODPY_PYBUILD=	hatchling
+MODPY_PYBUILD=	hatch-vcs
 MODPY_PYTEST=	Yes
-#MODPY_TEST_LIBDIR=	src
 
-BUILD_DEPENDS=	devel/py-hatch-vcs${MODPY_FLAVOR} \
-		devel/py-setuptools_scm${MODPY_FLAVOR}
 TEST_DEPENDS=	devel/py-appdirs${MODPY_FLAVOR} \
 		devel/py-test-mock${MODPY_FLAVOR}
 
diff --git a/textproc/py-black/Makefile b/textproc/py-black/Makefile
index 7f6c7c47ebe..bb12f4f2a8f 100644
--- a/textproc/py-black/Makefile
+++ b/textproc/py-black/Makefile
@@ -15,10 +15,9 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
 MODPY_PI=	Yes
-MODPY_PYBUILD=	hatchling
+MODPY_PYBUILD=	hatch-vcs
 
-BUILD_DEPENDS=	devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR} \
-		devel/py-hatch-vcs${MODPY_FLAVOR}
+BUILD_DEPENDS=	devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR}
 
 RUN_DEPENDS=	devel/py-click${MODPY_FLAVOR} \
 		devel/py-mypy-extensions${MODPY_FLAVOR} \