diff --git a/backports/py3-python-jwt/APKBUILD b/backports/py3-python-jwt/APKBUILD
new file mode 100644
index 0000000..324118d
--- /dev/null
+++ b/backports/py3-python-jwt/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Rejah Rehim <rejah@beaglesecurity.com>
+# Maintainer: Rejah Rehim <rejah@beaglesecurity.com>
+pkgname=py3-python-jwt
+_pkgname=python_jwt
+pkgver=3.3.0
+pkgrel=1
+pkgdesc="Module for generating and verifying JSON Web Tokens"
+options="!check" # no test suite
+url="https://github.com/davedoesdev/python-jwt"
+arch="noarch"
+license="MIT"
+depends="python3 py3-jwcrypto"
+makedepends="py3-setuptools"
+subpackages="$pkgname-doc"
+source="https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+	python3 setup.py build
+}
+
+package() {
+	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	install -Dm644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENCE
+	install -Dm644 README.md "$pkgdir"/usr/share/licenses/$pkgname/README.md
+}
+
+
+sha512sums="
+dfc5963eb3d374d44711ac42bb983c4cc44ad2e2231792991207d2ef15192bb8b686f0b76e3a324e19e1669f4c4bc06f27871e5072a22046169c54f6916e6fc1  python_jwt-3.3.0.tar.gz
+"
diff --git a/backports/py3-rapidjson/APKBUILD b/backports/py3-rapidjson/APKBUILD
new file mode 100644
index 0000000..ea20bb4
--- /dev/null
+++ b/backports/py3-rapidjson/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+pkgname=py3-rapidjson
+pkgver=1.9
+pkgrel=0
+pkgdesc="Python3 wrapper around RapidJSON"
+url="https://github.com/python-rapidjson/python-rapidjson"
+arch="all"
+license="MIT"
+depends="
+	python3
+	"
+makedepends="
+	py3-setuptools
+	rapidjson-dev
+	python3-dev
+	"
+checkdepends="
+	py3-pytest
+	py3-tz
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/python-rapidjson/python-rapidjson/archive/refs/tags/v$pkgver.tar.gz"
+builddir="$srcdir/"python-rapidjson-$pkgver
+
+build() {
+	python3 setup.py \
+		--rj-include-dir=/usr/include/rapidjson \
+		build
+}
+
+check() {
+	PYTHONPATH="$(echo "$PWD"/build/lib.linux*)" pytest \
+		--ignore benchmarks \
+		--deselect tests/test_base_types.py::test_base_values \
+		--deselect tests/test_unicode.py::test_unicode_decode_error \
+		--deselect tests/test_validator.py::test_additional_and_pattern_properties_valid \
+		#
+}
+
+package() {
+	python3 setup.py \
+		--rj-include-dir=/usr/include/rapidjson \
+		install \
+		--skip-build \
+		--prefix=/usr \
+		--root="$pkgdir"
+}
+
+sha512sums="
+d3f4c06d021058ea42f01f676e77dfa84997a681d548582060d20713878ecf73ada257186026847de43718764078f7e3a2467a165fa6d8b15b2f3e3d4bded4e1  py3-rapidjson-1.9.tar.gz
+"
diff --git a/backports/uvicorn/APKBUILD b/backports/uvicorn/APKBUILD
new file mode 100644
index 0000000..67ead0d
--- /dev/null
+++ b/backports/uvicorn/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=uvicorn
+pkgver=0.18.3
+pkgrel=0
+pkgdesc="Lightning-fast ASGI server"
+url="https://www.uvicorn.org/"
+license="BSD-3-Clause"
+arch="noarch"
+depends="
+	python3
+	py3-asgiref
+	py3-click
+	py3-h11
+	"
+makedepends="py3-build py3-hatchling py3-installer"
+checkdepends="
+	py3-dotenv
+	py3-httptools
+	py3-httpx
+	py3-pytest
+	py3-pytest-mock
+	py3-yaml
+	py3-trustme
+	py3-watchgod
+	py3-websockets
+	py3-wsproto
+	"
+subpackages="$pkgname-doc"
+source="https://github.com/encode/uvicorn/archive/$pkgver/uvicorn-$pkgver.tar.gz"
+
+case "$CARCH" in
+	# test suite blocked by py3-httpx
+	armhf|ppc64le) options="!check" ;;
+	# test suite blocked by py3-watchgod
+	s390x) options="!check" ;;
+esac
+
+build() {
+	python3 -m build --no-isolation --wheel
+}
+
+check() {
+	pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" dist/uvicorn-$pkgver-py3-none-any.whl
+
+	install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+sha512sums="
+a4983e7095f3596ac54557432a074eb8cae4c6dd579fabfe8b6c34606ba8258e6c0684c2e34e8019f2455fbfd1771f8c2c88bf8b01fc505abfae93655f61f032  uvicorn-0.18.3.tar.gz
+"
diff --git a/unmaintained/py-idna/APKBUILD b/unmaintained/py-idna/APKBUILD
index e171b3c..591a090 100644
--- a/unmaintained/py-idna/APKBUILD
+++ b/unmaintained/py-idna/APKBUILD
@@ -31,7 +31,7 @@ _py() {
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
 
 	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
+	$python3 setup.py install --prefix=/usr --root="$subpkgdir"
 }
 
 _py2() {
diff --git a/unmaintained/py-jinja2/APKBUILD b/unmaintained/py-jinja2/APKBUILD
index 1848c1c..3585f52 100644
--- a/unmaintained/py-jinja2/APKBUILD
+++ b/unmaintained/py-jinja2/APKBUILD
@@ -4,7 +4,7 @@ pkgname=py-jinja2
 _pkgname=Jinja2
 pkgver=2.10
 pkgrel=3
-pkgdesc="A small but fast and easy to use stand-alone python template engine"
+pkgdesc="A small but fast and easy to use stand-alone python3 template engine"
 url="http://jinja.pocoo.org/"
 arch="noarch"
 license="BSD"
@@ -45,7 +45,7 @@ _py() {
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
 
 	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
+	$python3 setup.py install --prefix=/usr --root="$subpkgdir"
 }
 
 doc() {
diff --git a/unmaintained/py3-tzdata/APKBUILD b/unmaintained/py3-tzdata/APKBUILD
index 60ef183..e607e03 100644
--- a/unmaintained/py3-tzdata/APKBUILD
+++ b/unmaintained/py3-tzdata/APKBUILD
@@ -21,8 +21,8 @@ build() {
 
 check(){
 	python3 -m venv --system-site-packages test-env
-	test-env/bin/python -m installer dist/*.whl
-	test-env/bin/python -m pytest
+	test-env/bin/python3 -m installer dist/*.whl
+	test-env/bin/python3 -m pytest
 }
 
 package() {
diff --git a/unmaintained/pytest/APKBUILD b/unmaintained/pytest/APKBUILD
index 90e22cd..18a6134 100644
--- a/unmaintained/pytest/APKBUILD
+++ b/unmaintained/pytest/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=pytest
 pkgver=4.5.0
 pkgrel=2
-pkgdesc="A python test library"
+pkgdesc="A python3 test library"
 url="https://docs.pytest.org/en/latest/"
 arch="noarch"
 license="MIT"
@@ -54,7 +54,7 @@ _py() {
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
 
 	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
+	$python3 setup.py install --prefix=/usr --root="$subpkgdir"
 
 	# Add version suffix to executable files.
 	local path; for path in "$subpkgdir"/usr/bin/*; do
diff --git a/user/py3-click-didyoumean/APKBUILD b/user/py3-click-didyoumean/APKBUILD
index e10e970..d703146 100644
--- a/user/py3-click-didyoumean/APKBUILD
+++ b/user/py3-click-didyoumean/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=click-didyoumean
 pkgname="py3-$_pyname"
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 arch="noarch"
 pkgdesc="Enables git-like *did-you-mean* feature in click"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-click-repl/APKBUILD b/user/py3-click-repl/APKBUILD
index 3a0b9c9..70a52ff 100644
--- a/user/py3-click-repl/APKBUILD
+++ b/user/py3-click-repl/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=click-repl
 pkgname="py3-$_pyname"
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="REPL plugin for Click"
 url="https://pypi.python.org/project/$_pyname"
@@ -17,7 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -26,7 +26,7 @@ check() {
 }
 
 package() {
-	python setup.py install --skip-build \
+	python3 setup.py install --skip-build \
 		--optimize=1 \
 		--root="$pkgdir"
 	install -vDm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}/"
diff --git a/user/py3-dacite/APKBUILD b/user/py3-dacite/APKBUILD
index 2831db5..1e8315d 100644
--- a/user/py3-dacite/APKBUILD
+++ b/user/py3-dacite/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=dacite
 pkgname="py3-$_pyname"
 pkgver=1.7.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="This module simplifies creation of data classes (PEP 557) from dictionaries."
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir" --optimize=1
 	install -Dm644 "./LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 sha512sums="
diff --git a/user/py3-deepmerge/APKBUILD b/user/py3-deepmerge/APKBUILD
index 2ad655b..892a8c0 100644
--- a/user/py3-deepmerge/APKBUILD
+++ b/user/py3-deepmerge/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=deepmerge
 pkgname="py3-$_pyname"
 pkgver=1.1.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="A tools to handle merging of nested data structures in python."
 url="https://pypi.python.org/project/$_pyname"
@@ -17,7 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python -m build --wheel --skip-dependency-check --no-isolation
+	python3 -m build --wheel --skip-dependency-check --no-isolation
 }
 
 check() {
@@ -25,7 +25,7 @@ check() {
 }
 
 package() {
-	python -m installer --destdir="$pkgdir" dist/*.whl
+	python3 -m installer --destdir="$pkgdir" dist/*.whl
 	install -vDm 644 README.rst -t "$pkgdir/usr/share/doc/$pkgname"
 	install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/user/py3-django-drf-spectacular/APKBUILD b/user/py3-django-drf-spectacular/APKBUILD
index 244d9de..7c4ec96 100644
--- a/user/py3-django-drf-spectacular/APKBUILD
+++ b/user/py3-django-drf-spectacular/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=drf-spectacular
 pkgname="py3-django-$_pyname"
 pkgver=0.25.1
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Sane and flexible OpenAPI 3 schema generation for Django REST framework"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/unmaintained/py3-django-environ/APKBUILD b/user/py3-django-environ/APKBUILD
similarity index 92%
rename from unmaintained/py3-django-environ/APKBUILD
rename to user/py3-django-environ/APKBUILD
index 59450eb..32ed954 100644
--- a/unmaintained/py3-django-environ/APKBUILD
+++ b/user/py3-django-environ/APKBUILD
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python -m build --wheel --no-isolation
+	python3 -m build --wheel --no-isolation
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python -m installer --destdir="$pkgdir" dist/*.whl
+	python3 -m installer --destdir="$pkgdir" dist/*.whl
 	install -vDm 644 AUTHORS.rst -t "$pkgdir/usr/share/doc/$pkgname/"
 	install -vDm 644 CHANGELOG.rst -t "$pkgdir/usr/share/doc/$pkgname/"
 	install -vDm 644 README.rst -t "$pkgdir/usr/share/doc/$pkgname/"
diff --git a/user/py3-django-guardian/APKBUILD b/user/py3-django-guardian/APKBUILD
index ee7579c..a3905dc 100644
--- a/user/py3-django-guardian/APKBUILD
+++ b/user/py3-django-guardian/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=django-guardian
 pkgname="py3-$_pyname"
 pkgver=2.4.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Implementation of per object permissions on top of Django’s authorization backend"
 url="https://pypi.python.org/project/$_pyname"
@@ -17,7 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -25,7 +25,7 @@ check() {
 }
 
 package() {
-	python setup.py install --skip-build \
+	python3 setup.py install --skip-build \
 		--optimize=1 \
 		--root="$pkgdir"
 	install -vDm 644 AUTHORS -t "$pkgdir/usr/share/doc/$pkgname"
diff --git a/unmaintained/py3-django-oauth-toolkit/APKBUILD b/user/py3-django-oauth-toolkit/APKBUILD
similarity index 100%
rename from unmaintained/py3-django-oauth-toolkit/APKBUILD
rename to user/py3-django-oauth-toolkit/APKBUILD
diff --git a/user/py3-django-otp/APKBUILD b/user/py3-django-otp/APKBUILD
index 037e2da..ba70848 100644
--- a/user/py3-django-otp/APKBUILD
+++ b/user/py3-django-otp/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=django-otp
 pkgname="py3-$_pyname"
 pkgver=1.1.4
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="A pluggable framework for adding two-factor authentication to Django using one-time passwords."
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --skip-build --root="$pkgdir/" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir/" --optimize=1
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 sha512sums="
diff --git a/user/py3-django-prometheus/APKBUILD b/user/py3-django-prometheus/APKBUILD
index eab3450..a191221 100644
--- a/user/py3-django-prometheus/APKBUILD
+++ b/user/py3-django-prometheus/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=django-prometheus
 pkgname="py3-$_pyname"
 pkgver=2.2.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Django middlewares to monitor your application with Prometheus.io."
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-django-redis/APKBUILD b/user/py3-django-redis/APKBUILD
index f5f7775..e22065b 100644
--- a/user/py3-django-redis/APKBUILD
+++ b/user/py3-django-redis/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=django-redis
 pkgname="py3-$_pyname"
 pkgver=5.2.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Full featured redis cache backend for Django."
 url="https://pypi.python.org/project/$_pyname"
@@ -20,7 +20,7 @@ check() {
 }
 
 package() {
-	python setup.py install --root="${pkgdir}" -O1
+	python3 setup.py install --root="${pkgdir}" -O1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-django-rest-framework-guardian/APKBUILD b/user/py3-django-rest-framework-guardian/APKBUILD
index a7c4fdd..8995893 100644
--- a/user/py3-django-rest-framework-guardian/APKBUILD
+++ b/user/py3-django-rest-framework-guardian/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=djangorestframework-guardian
 pkgname="py3-django-rest-framework-guardian"
 pkgver=0.3.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="django-guardian support for Django REST Framework"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-docker/APKBUILD b/user/py3-docker/APKBUILD
index 41b334a..7e47129 100644
--- a/user/py3-docker/APKBUILD
+++ b/user/py3-docker/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=docker
 pkgname="py3-$_pyname"
 pkgver=6.0.1
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="A Python library for the Docker Engine API."
 url="https://pypi.python.org/project/$_pyname"
@@ -21,7 +21,7 @@ prepare() {
 
 build() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
-	python -m build --wheel --no-isolation
+	python3 -m build --wheel --no-isolation
 }
 
 check() {
@@ -29,7 +29,7 @@ check() {
 }
 
 package() {
-	python -m installer --destdir="$pkgdir" dist/*.whl
+	python3 -m installer --destdir="$pkgdir" dist/*.whl
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-dumb-init/APKBUILD b/user/py3-dumb-init/APKBUILD
index 3f0e366..30dc317 100644
--- a/user/py3-dumb-init/APKBUILD
+++ b/user/py3-dumb-init/APKBUILD
@@ -5,7 +5,7 @@ _pyname=dumb-init
 pkgname="py3-$_pyname"
 pkgver=1.2.5
 _pkgver=1.2.5.post1
-pkgrel=0
+pkgrel=1
 arch="all"
 pkgdesc="Simple wrapper script which proxies signals to a child"
 url="https://pypi.python.org/project/$_pyname"
@@ -17,7 +17,7 @@ source="$pkgname-$_pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}
 builddir="$srcdir"/$_pyname-$_pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -25,7 +25,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-duo-client/APKBUILD b/user/py3-duo-client/APKBUILD
index 353e599..ede6e52 100644
--- a/user/py3-duo-client/APKBUILD
+++ b/user/py3-duo-client/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=duo_client
 pkgname="py3-duo-client"
 pkgver=4.5.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Reference client for Duo Security APIs"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-facebook-sdk/APKBUILD b/user/py3-facebook-sdk/APKBUILD
index c63a658..476714e 100644
--- a/user/py3-facebook-sdk/APKBUILD
+++ b/user/py3-facebook-sdk/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=facebook-sdk
 pkgname="py3-$_pyname"
 pkgver=3.1.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Python SDK for Facebook's Graph API"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/mobolic/facebook-sdk/archive
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-flower/APKBUILD b/user/py3-flower/APKBUILD
index 8ac5620..e56f963 100644
--- a/user/py3-flower/APKBUILD
+++ b/user/py3-flower/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=flower
 pkgname="py3-$_pyname"
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Real-time monitor and web admin for Celery distributed task queue"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --root="$pkgdir" -O1
+	python3 setup.py install --root="$pkgdir" -O1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/unmaintained/py3-hatch-fancy-pypi-readme/APKBUILD b/user/py3-hatch-fancy-pypi-readme/APKBUILD
similarity index 100%
rename from unmaintained/py3-hatch-fancy-pypi-readme/APKBUILD
rename to user/py3-hatch-fancy-pypi-readme/APKBUILD
diff --git a/unmaintained/py3-memcached/APKBUILD b/user/py3-memcached/APKBUILD
similarity index 97%
rename from unmaintained/py3-memcached/APKBUILD
rename to user/py3-memcached/APKBUILD
index 0e75210..3d13c96 100644
--- a/unmaintained/py3-memcached/APKBUILD
+++ b/user/py3-memcached/APKBUILD
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/linsomniac/python-memcached/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
diff --git a/user/py3-opencontainers/APKBUILD b/user/py3-opencontainers/APKBUILD
index e06eeec..59f9e69 100644
--- a/user/py3-opencontainers/APKBUILD
+++ b/user/py3-opencontainers/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=opencontainers
 pkgname="py3-$_pyname"
 pkgver=0.0.14
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Python module for oci specifications"
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/unmaintained/py3-pyaml/APKBUILD b/user/py3-pyaml/APKBUILD
similarity index 100%
rename from unmaintained/py3-pyaml/APKBUILD
rename to user/py3-pyaml/APKBUILD
diff --git a/unmaintained/py3-pytest-django/APKBUILD b/user/py3-pytest-django/APKBUILD
similarity index 100%
rename from unmaintained/py3-pytest-django/APKBUILD
rename to user/py3-pytest-django/APKBUILD
diff --git a/unmaintained/py3-rauth/APKBUILD b/user/py3-rauth/APKBUILD
similarity index 100%
rename from unmaintained/py3-rauth/APKBUILD
rename to user/py3-rauth/APKBUILD
diff --git a/user/py3-redis-nonfree/APKBUILD b/user/py3-redis-nonfree/APKBUILD
index 3b854a5..f612bb2 100644
--- a/user/py3-redis-nonfree/APKBUILD
+++ b/user/py3-redis-nonfree/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-redis-nonfree
 _pkgname=redis
 pkgver=4.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Python3 client for Redis key-value store"
 url="https://github.com/andymccurdy/redis-py"
 arch="noarch"
@@ -14,9 +14,7 @@ checkdepends="py3-pytest py3-mock redis py3-pytest-asyncio"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 options="!check"
-
-replaces="py-redis" # Backwards compatibility
-provides="py-redis=$pkgver-r$pkgrel" # Backwards compatibility
+provides="py3-redis=$pkgver-r$pkgrel"
 
 build() {
 	python3 setup.py build
diff --git a/user/py3-swagger-spec-validator/APKBUILD b/user/py3-swagger-spec-validator/APKBUILD
index cbe203d..910b4ea 100644
--- a/user/py3-swagger-spec-validator/APKBUILD
+++ b/user/py3-swagger-spec-validator/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=swagger-spec-validator
 pkgname="py3-$_pyname"
 pkgver=3.0.3
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Validation of Swagger specifications"
 url="https://pypi.python.org/project/$_pyname"
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --root="$pkgdir"/ --optimize=1
+	python3 setup.py install --root="$pkgdir"/ --optimize=1
 	install -Dm644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-twilio/APKBUILD b/user/py3-twilio/APKBUILD
index 5867541..26fea8d 100644
--- a/user/py3-twilio/APKBUILD
+++ b/user/py3-twilio/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=twilio
 pkgname="py3-$_pyname"
 pkgver=7.13.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Twilio API client and TwiML generator"
 url="https://pypi.python.org/project/$_pyname"
@@ -20,7 +20,7 @@ check() {
 }
 
 package() {
-	python setup.py install --root="$pkgdir/" --optimize=1
+	python3 setup.py install --root="$pkgdir/" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-webauthn/APKBUILD b/user/py3-webauthn/APKBUILD
index 4a32f2c..d91c72a 100644
--- a/user/py3-webauthn/APKBUILD
+++ b/user/py3-webauthn/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=webauthn
 pkgname="py3-$_pyname"
 pkgver=1.6.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="A Python3 implementation of the WebAuthn API focused on making it easy to leverage the power of WebAuthn."
 url="https://pypi.python.org/project/$_pyname"
@@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python setup.py build
+	python3 setup.py build
 }
 
 check() {
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="
diff --git a/user/py3-whoosh/APKBUILD b/user/py3-whoosh/APKBUILD
index 014e980..ddf389b 100644
--- a/user/py3-whoosh/APKBUILD
+++ b/user/py3-whoosh/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=py3-whoosh
 _pyname="Whoosh"
 pkgver=2.7.4
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Fast, pure-Python full text indexing, search, and spell checking library"
 url="https://pypi.python.org/project/$_pyname"
@@ -19,7 +19,7 @@ build() {
 }
 
 check() {
-	python setup.py ptr || warning "Tests failed"
+	python3 setup.py ptr || warning "Tests failed"
 }
 
 package() {
diff --git a/user/py3-xmlsec/APKBUILD b/user/py3-xmlsec/APKBUILD
index c12f714..e89d293 100644
--- a/user/py3-xmlsec/APKBUILD
+++ b/user/py3-xmlsec/APKBUILD
@@ -4,7 +4,7 @@
 _pyname=xmlsec
 pkgname="py3-$_pyname"
 pkgver=1.3.13
-pkgrel=0
+pkgrel=1
 arch="all"
 pkgdesc="Python bindings for the XML Security Library"
 url="https://pypi.python.org/project/$_pyname"
@@ -26,7 +26,7 @@ check() {
 }
 
 package() {
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 	install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 sha512sums="