diff --git a/Makefile b/Makefile
index 9a9a24c..b3d5640 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,16 @@
-PKG = yhttp.ext.dbmanager
+PKG_NAMESPACE = yhttp.ext.dbmanager
 PKG_NAME = yhttp-dbmanager
+PYDEPS_COMMON = \
+	'coveralls' \
+	'bddrest >= 4, < 5' \
+	'bddcli >= 2.5.1, < 3' \
+	'yhttp-dev >= 3.1.2'
+
+
 include make/common.mk
-include make/test.mk
+include make/venv.mk
+include make/install.mk
+include make/lint.mk
+include make/dist.mk
 include make/pypi.mk
+include make/test.mk
diff --git a/make b/make
index a3cd500..072e72d 160000
--- a/make
+++ b/make
@@ -1 +1 @@
-Subproject commit a3cd500dc279fc6abd3fb210cfec696572652fbf
+Subproject commit 072e72d85a18cfc772ddad6411a6b2be1e79dc97
diff --git a/requirements-ci.txt b/requirements-ci.txt
deleted file mode 100644
index f03c827..0000000
--- a/requirements-ci.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-build
-setuptools
-bddcli >= 2.5.1, < 3
-coverage < 6
-coveralls
-pytest >= 4.4.0
-pytest-cov
-flake8
-yhttp-dev >= 3.1.1
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index ee127b4..0000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--r requirements-ci.txt
-pytest-pudb
-ipython
-twine